subject:"E CVS\: apps\/ephoto titan"

E CVS: apps/ephoto titan

2008-06-14 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.c ephoto.h ephoto_albums.c ephoto_database.c 
ephoto_dialogs.c ephoto_gui.c ephoto_main.c 
ephoto_normal_view.c ephoto_single_view.c 


Log Message:
Change from Freebox to Freebox_mvc.. update to work with fill policy changes

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ephoto.c8 Apr 2008 22:39:00 -   1.9
+++ ephoto.c14 Jun 2008 21:35:01 -  1.10
@@ -1,62 +1,15 @@
 #include ephoto.h
 
-Ephoto_Config *ec;
 Ephoto_Main *em;
 
 int 
 main(int argc, char **argv)
 {
-   int i;
-
 if (!ewl_init(argc, argv))
 {
-printf(Ewl is not usable, please check your installation!\n);
+printf(Ewl is not usable, check your installation!\n);
 return 1;
 }
-
-   em = NULL;
-em = calloc(1, sizeof(Ephoto_Main));
-
-em-albums = ecore_list_new();
-em-fsystem = ecore_list_new();
-em-images = ecore_dlist_new();
-
-em-types = ecore_hash_new(ecore_str_hash, ecore_str_compare); 
-   ecore_hash_set(em-types, image/gif, image);
-ecore_hash_set(em-types, image/jpeg, image);
-ecore_hash_set(em-types, image/png, image);
-ecore_hash_set(em-types, image/svg+xml, image);
-ecore_hash_set(em-types, image/tiff, image);
-
-   ec = NULL;
-   ec = calloc(1, sizeof(Ephoto_Config));
-
-   for(i = 1; i  argc; i++)
-   {
-   if (!strcmp(argv[i], --help))
-   {
-   printf( Help Page\n
-   ephoto %%f - Opens an image for viewing\n);
-   return 0;
-   }
-   else
-   {
-   if(strncmp(argv[i], /, 1))
-   {
-   char buf[PATH_MAX], file[PATH_MAX]; 
-
-   getcwd(buf, PATH_MAX);
-   buf[sizeof(buf)-1] = '\0';
-
-   snprintf(file, PATH_MAX, %s/%s, buf, argv[i]);
-   if (ecore_file_exists(file))
-   ec-requested_image = file;
-   }
-   else
-   if (ecore_file_exists(argv[i]))
-   ec-requested_image = argv[i];
-   }
-   }
 
 #ifdef ENABLE_NLS
setlocale(LC_MESSAGES, );
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ephoto.h8 Apr 2008 22:39:00 -   1.28
+++ ephoto.h14 Jun 2008 21:35:01 -  1.29
@@ -69,7 +69,6 @@
 
 /*ephoto_dialogs.c*/
 void about_dialog(Ewl_Widget *w, void *event, void *data);
-void add_album_dialog(Ewl_Widget *w, void *event, void *data);
 
 /*ephoto_exif.c*/
 #ifdef BUILD_EXIF_SUPPORT
@@ -108,7 +107,7 @@
void *cb, 
void *data);
 Ewl_Widget *add_text(Ewl_Widget *c, char *text);
-Ewl_Widget *add_window(char *name, int w, int h, void *cb, 
+Ewl_Widget *add_window(char *title, int w, int h, void *cb, 
void *data);
 
 /*ephoto_imaging.c*/
@@ -170,6 +169,7 @@
 Ewl_Widget *fbox;
 Ewl_Widget *ftree;
Ewl_Widget *fthumb_size;
+   Ewl_Widget *scroll;
Ewl_Widget *simage;
 Ewl_Widget *single_vbox;
 Ewl_Widget *view;
@@ -178,16 +178,6 @@
 sqlite3 *db;
 };
 
-typedef struct _Ephoto_Config Ephoto_Config;
-
-struct _Ephoto_Config
-{
-   char *requested_album;
-   char *requested_directory;
-   char *requested_image;
-};
-
 extern Ephoto_Main *em;
-extern Ephoto_Config *ec;
 
 #endif
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_albums.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ephoto_albums.c 23 Apr 2008 21:28:10 -  1.6
+++ ephoto_albums.c 14 Jun 2008 21:35:01 -  1.7
@@ -10,7 +10,6 @@
 static unsigned int album_data_count(void *data);
 static void add_rc_menu(Ewl_Widget *w, void *event, void *data);
 static void album_clicked(Ewl_Widget *w, void *event, void *data);
-static void thumb_clicked(Ewl_Widget *w, void *event, void *data);
 static void populate_images(Ewl_Widget *w, void *event, void *data);
 
 void 
@@ -45,13 +44,14 @@
 ewl_view_header_fetch_set(view, album_header_fetch);
 
tree = ewl_tree_new();
-   ewl_tree_headers_visible_set(EWL_TREE(tree), 0);
-

E CVS: apps/ephoto titan

2008-04-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_albums.c ephoto_single_view.c 


Log Message:
Allow zooming in on the single view image further than proportional fit.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_albums.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ephoto_albums.c 10 Apr 2008 00:53:39 -  1.5
+++ ephoto_albums.c 23 Apr 2008 21:28:10 -  1.6
@@ -236,7 +236,7 @@
 
 if (imagef)
 {
-thumb = add_image(em-fbox, imagef, 1,
+   thumb = add_image(em-fbox, imagef, 1,
 thumb_clicked, NULL);
 ewl_image_constrain_set(EWL_IMAGE(thumb),
 ewl_range_value_get(EWL_RANGE
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_single_view.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto_single_view.c9 Apr 2008 19:47:39 -   1.13
+++ ephoto_single_view.c23 Apr 2008 21:28:10 -  1.14
@@ -17,6 +17,7 @@
 static void close_channel(Ewl_Widget *w, void *event, void *data);
 static void channel_mixer(Ewl_Widget *w, void *event, void *data);
 static void set_requested_image_file(Ewl_Widget *w, void *event, void *data);
+static void set_image_file(Ewl_Widget *w, void *event, void *data);
 
 static void 
 set_requested_image_file(Ewl_Widget *w, void *event, void *data)
@@ -24,6 +25,14 @@
ewl_image_file_path_set(EWL_IMAGE(w), ec-requested_image);
 }
 
+static void
+set_image_file(Ewl_Widget *w, void *event, void *data)
+{
+   ewl_image_file_path_set(EWL_IMAGE(w), ecore_dlist_current(em-images));
+   ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
+   ewl_callback_del(w, EWL_CALLBACK_CONFIGURE, set_image_file);
+}
+
 Ewl_Widget *
 add_single_view(Ewl_Widget *c)
 {
@@ -106,8 +115,8 @@
em-single_vbox);
if (ecore_dlist_current(em-images))
{
-   ewl_image_file_path_set(EWL_IMAGE(em-simage), 
-   ecore_dlist_current(em-images));
+   ewl_callback_append(em-simage, EWL_CALLBACK_CONFIGURE,
+   set_image_file, NULL);
}
return;
 }



-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2008-04-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_exif.c 


Log Message:
Fix compile error

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_exif.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ephoto_exif.c   8 Apr 2008 22:39:00 -   1.20
+++ ephoto_exif.c   24 Apr 2008 02:21:08 -  1.21
@@ -133,7 +133,7 @@
ewl_container_child_append(EWL_CONTAINER(c), sp);
ewl_widget_show(sp);

-   model = ewl_model_ecore_list_get();
+   model = ewl_model_ecore_list_instance();
view = ewl_label_view_get();
 
list = ewl_list_new();



-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2008-04-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_gui.c 


Log Message:
Text/Labels should not be shrunk.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto_gui.c8 Apr 2008 22:39:00 -   1.12
+++ ephoto_gui.c10 Apr 2008 20:40:50 -  1.13
@@ -109,8 +109,6 @@
if(lbl) ewl_label_text_set(EWL_LABEL(label), _(lbl));
ewl_object_alignment_set(EWL_OBJECT(label), 
EWL_FLAG_ALIGN_CENTER);
-   ewl_object_fill_policy_set(EWL_OBJECT(label), 
-   EWL_FLAG_FILL_SHRINK);
if(c) ewl_container_child_append(EWL_CONTAINER(c), label);
ewl_widget_show(label);
 
@@ -175,8 +173,6 @@
if(txt) ewl_text_text_set(EWL_TEXT(text), _(txt));
 ewl_object_alignment_set(EWL_OBJECT(text), 
EWL_FLAG_ALIGN_CENTER);
-ewl_object_fill_policy_set(EWL_OBJECT(text), 
-   EWL_FLAG_FILL_SHRINK);
 if(c) ewl_container_child_append(EWL_CONTAINER(c), text);
 ewl_widget_show(text);
 



-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2008-04-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_import.c 


Log Message:
Use labels instead of text for this..

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_import.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto_import.c 8 Apr 2008 22:39:00 -   1.1
+++ ephoto_import.c 10 Apr 2008 20:47:24 -  1.2
@@ -77,11 +77,11 @@
 vbox = add_box(window, EWL_ORIENTATION_VERTICAL, 10);
 ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
 
-add_text(vbox, Please provide a name for the new album:);
+add_label(vbox, Please provide a name for the new album:);
 
 name_entry = add_entry(vbox, New Album, NULL, NULL);
 
-add_text(vbox, Please provide a short description for this album:);
+add_label(vbox, Please provide a short description for this album:);
 
 desc_entry = add_entry(vbox, Album Description, NULL, NULL);
 



-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2008-04-09 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_albums.c ephoto_normal_view.c ephoto_single_view.c 


Log Message:
Added some images, bumped up the version.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_albums.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto_albums.c 8 Apr 2008 22:39:00 -   1.1
+++ ephoto_albums.c 9 Apr 2008 19:47:39 -   1.2
@@ -44,7 +44,7 @@
ewl_mvc_view_set(EWL_MVC(tree), view);
ewl_mvc_selection_mode_set(EWL_MVC(tree), EWL_SELECTION_MODE_SINGLE);
ewl_object_fill_policy_set(EWL_OBJECT(tree), EWL_FLAG_FILL_ALL);
-   ewl_container_child_append(EWL_CONTAINER(c), tree);
+   ewl_container_child_prepend(EWL_CONTAINER(c), tree);
ewl_widget_show(tree);
 
return tree;
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_normal_view.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ephoto_normal_view.c8 Apr 2008 22:39:00 -   1.21
+++ ephoto_normal_view.c9 Apr 2008 19:47:39 -   1.22
@@ -23,7 +23,7 @@
 Ewl_Widget *
 add_normal_view(Ewl_Widget *c)
 {
-   Ewl_Widget *box, *button, *hbox, *sp, *vbox;
+   Ewl_Widget *avbox, *box, *button, *hbox, *image, *sp, *vbox;
 
 em-fbox_vbox = add_box(c, EWL_ORIENTATION_VERTICAL, 5);
 ewl_object_fill_policy_set(EWL_OBJECT(em-fbox_vbox), 
@@ -36,12 +36,10 @@
ewl_container_child_append(EWL_CONTAINER(em-fbox_vbox), hbox);
ewl_widget_show(hbox);
 
-   vbox = add_box(hbox, EWL_ORIENTATION_VERTICAL, 2);
-   ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_VFILL);  
-
-   show_albums(vbox);
+   avbox = add_box(hbox, EWL_ORIENTATION_VERTICAL, 2);
+   ewl_object_fill_policy_set(EWL_OBJECT(avbox), EWL_FLAG_FILL_VFILL); 
 
-   box = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 2);
+   box = add_box(avbox, EWL_ORIENTATION_HORIZONTAL, 2);
ewl_object_fill_policy_set(EWL_OBJECT(box), EWL_FLAG_FILL_SHRINK);
 
button = add_button(box, Import, PACKAGE_DATA_DIR /images/add.png, 
@@ -65,16 +63,27 @@
 ewl_container_child_append(EWL_CONTAINER(sp), em-fbox);
 ewl_widget_show(em-fbox);
 
+   box = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 10);
+   ewl_object_fill_policy_set(EWL_OBJECT(box), EWL_FLAG_FILL_SHRINK);
+
+   image = add_image(box, PACKAGE_DATA_DIR /images/image.png, 0, NULL, 
NULL);
+   ewl_image_constrain_set(EWL_IMAGE(image), 20);
+
em-fthumb_size = ewl_hseeker_new();
ewl_range_minimum_value_set(EWL_RANGE(em-fthumb_size), 16);
ewl_range_maximum_value_set(EWL_RANGE(em-fthumb_size), 144);
ewl_range_step_set(EWL_RANGE(em-fthumb_size), 16);
ewl_range_value_set(EWL_RANGE(em-fthumb_size), 80);
-   ewl_container_child_append(EWL_CONTAINER(vbox), em-fthumb_size);
+   ewl_container_child_append(EWL_CONTAINER(box), em-fthumb_size);
ewl_callback_append(em-fthumb_size, EWL_CALLBACK_VALUE_CHANGED, 
change_size, NULL);
ewl_object_maximum_size_set(EWL_OBJECT(em-fthumb_size), 160, 40);
ewl_widget_show(em-fthumb_size);
+
+   show_albums(avbox);
+
+   image = add_image(box, PACKAGE_DATA_DIR /images/image.png, 0, NULL, 
NULL);
+   ewl_image_constrain_set(EWL_IMAGE(image), 32);
 
return em-fbox_vbox;
 }
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_single_view.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto_single_view.c8 Apr 2008 22:39:00 -   1.12
+++ ephoto_single_view.c9 Apr 2008 19:47:39 -   1.13
@@ -117,12 +117,12 @@
 {
Ewl_Widget *image;
 
-   image = add_image(c, PACKAGE_DATA_DIR /images/search.png, 0, zoom_in, 
+   image = add_image(c, PACKAGE_DATA_DIR /images/in.png, 0, zoom_in, 
NULL);
 ewl_image_size_set(EWL_IMAGE(image), 25, 25);
 ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_LEFT);
 
-   image = add_image(c, PACKAGE_DATA_DIR /images/search.png, 0, zoom_out,
+   image = add_image(c, PACKAGE_DATA_DIR /images/out.png, 0, zoom_out,
NULL);
 ewl_image_size_set(EWL_IMAGE(image), 25, 25);
 ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_LEFT);



-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2.

E CVS: apps/ephoto titan

2008-04-09 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/images


Modified Files:
Makefile.am search.png 
Added Files:
in.png out.png 


Log Message:
Added some images, bumped up the version.

===
RCS file: /cvs/e/e17/apps/ephoto/data/images/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 14 Sep 2007 18:23:38 -  1.7
+++ Makefile.am 9 Apr 2008 19:47:38 -   1.8
@@ -15,10 +15,12 @@
go-down.png \
go-next.png \
image.png \
+   in.png \
list_view.png \
media-seek-backward.png \
media-seek-forward.png \
normal_view.png \
+   out.png \
photo_lens.png \
preferences-system.png \
redo.png \
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/search.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
Binary files /tmp/cvszBCpAK and /tmp/cvsxJGgYc differ



-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2008-04-09 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto


Modified Files:
AUTHORS TODO configure.in 


Log Message:
Added some images, bumped up the version.

===
RCS file: /cvs/e/e17/apps/ephoto/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- AUTHORS 15 Feb 2007 10:20:18 -  1.1
+++ AUTHORS 9 Apr 2008 19:47:38 -   1.2
@@ -6,6 +6,4 @@
 / /__/  /__/ /__/ /___//_//___/
 
 ===Project Manager/Lead Developer===
-Stephen UnixTitan Houston [EMAIL PROTECTED]
-===People That Helped===
-boycott tokyo [EMAIL PROTECTED]
+Stephen okra Houston [EMAIL PROTECTED]
===
RCS file: /cvs/e/e17/apps/ephoto/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- TODO10 Jun 2007 22:37:18 -  1.4
+++ TODO9 Apr 2008 19:47:38 -   1.5
@@ -10,19 +10,17 @@
 ===Command Line===
 Get some command line options going!
 ===General===
-Dialogs For Adding/Removing Albums/Images.
+Album/Image Removal
 DRAG AND DROP IS A MUST!
 Keybindings
 ===Layout===
 Ideas and Changes are welcome!
 ===Normal View===
 -
-===Edit View===
+===Single View===
 Add Editing Controls(Zooms/Color Enhancement/Histogram/Cropping/etc..).
-Better  Saving Ability(This will include looking into editing and saving exif 
data).
+Better Saving Ability(This will include looking into editing and saving exif 
data).
 Should we list navigation for other images better?(than using buttons with 
arrows)
-===Single View===
-Should we list navigation for other images better?(than using buttons with 
arrwos)
 ===Slideshow===
 Need to Add Configuration to Slideshows..
 
===
RCS file: /cvs/e/e17/apps/ephoto/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- configure.in15 Mar 2008 20:18:24 -  1.13
+++ configure.in9 Apr 2008 19:47:38 -   1.14
@@ -4,7 +4,7 @@
 rm -f config.cache
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(ephoto, 2.15.0)
+AM_INIT_AUTOMAKE(ephoto, 3.15.0)
 AM_CONFIG_HEADER(src/bin/config.h)
 
 AC_ISC_POSIX



-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2008-04-09 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_albums.c 


Log Message:
Bug fix for when albums are clicked

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_albums.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ephoto_albums.c 9 Apr 2008 19:47:39 -   1.2
+++ ephoto_albums.c 10 Apr 2008 00:31:33 -  1.3
@@ -11,6 +11,7 @@
 static void add_rc_menu(Ewl_Widget *w, void *event, void *data);
 static void album_clicked(Ewl_Widget *w, void *event, void *data);
 static void thumb_clicked(Ewl_Widget *w, void *event, void *data);
+static void populate_images(Ewl_Widget *w, void *event, void *data);
 
 void 
 show_albums(Ewl_Widget *c)
@@ -108,7 +109,7 @@
 static void album_clicked(Ewl_Widget *w, void *event, void *data)
 {
em-current_album = strdup(ewl_icon_label_get(EWL_ICON(w)));
-   populate_albums(NULL, NULL, NULL);
+   populate_images(NULL, NULL, NULL);
 }
 
 static void 
@@ -157,8 +158,8 @@
 populate_albums(Ewl_Widget *w, void *event, void *data)
 {
const char *album;
-   pthread_t thumb_worker, album_worker, image_worker;
-   int ret1, ret2;
+   pthread_t album_worker;
+   int ret1;

album = NULL;
 
@@ -169,26 +170,40 @@
}
 
if (!ecore_list_empty_is(em-albums))
-   {
ecore_list_destroy(em-albums);
-   }
-   if (!ecore_list_empty_is(em-images))
-   {
-   ecore_dlist_destroy(em-images);
-   }
 
em-albums = ecore_list_new();
-   em-images = ecore_dlist_new();
-   if(em-fbox) ewl_container_reset(EWL_CONTAINER(em-fbox));
-
+   
ret1 = pthread_create(album_worker, NULL, get_albums_pre, NULL);
-   ret2 = pthread_create(image_worker, NULL, get_aimages_pre, NULL);
-   if (ret1 || ret2)
+   if (ret1)
{
printf(ERROR: Couldn't create thread!\n);
return;
}
pthread_join(album_worker, NULL);
+
+   populate_images(NULL, NULL, NULL);
+
+   return;
+}
+
+static void
+populate_images(Ewl_Widget *w, void *event, void *data)
+{
+   pthread_t thumb_worker, image_worker;
+   int ret1;
+
+   if (!ecore_list_empty_is(em-images))
+   ecore_dlist_destroy(em-images);
+
+   em-images = ecore_dlist_new();
+   if (em-fbox) ewl_container_reset(EWL_CONTAINER(em-fbox));
+
+   ret1 = pthread_create(image_worker, NULL, get_aimages_pre, NULL);
+   if (ret1)
+   {   printf(ERROR: Couldn't create thread!\n);
+   return;
+   }
pthread_join(image_worker, NULL);
 
ret1 = pthread_create(thumb_worker, NULL, create_athumb, NULL);



-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2008-04-09 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_albums.c 


Log Message:
get rid of highlighting

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_albums.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto_albums.c 10 Apr 2008 00:31:33 -  1.3
+++ ephoto_albums.c 10 Apr 2008 00:46:29 -  1.4
@@ -22,6 +22,12 @@
populate_albums(NULL, NULL, NULL);
 }
 
+static unsigned int
+highlight_cb(void *data, unsigned int row)
+{
+   return 0;
+}
+
 static Ewl_Widget *
 add_atree(Ewl_Widget *c)
 {
@@ -32,6 +38,7 @@
model = ewl_model_new();
ewl_model_data_fetch_set(model, album_data_fetch);
ewl_model_data_count_set(model, album_data_count);
+   ewl_model_data_highlight_set(model, highlight_cb);
 
 view = ewl_view_new();
 ewl_view_widget_fetch_set(view, album_view_new);



-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2008-04-09 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_albums.c 


Log Message:
Fix a segfault

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_albums.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ephoto_albums.c 10 Apr 2008 00:46:29 -  1.4
+++ ephoto_albums.c 10 Apr 2008 00:53:39 -  1.5
@@ -219,7 +219,7 @@
printf(ERROR: Couldn't create thread!\n);
return;
}
-   pthread_detach(thumb_worker);
+   pthread_join(thumb_worker, NULL);
 
return;
 }



-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-09-14 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
Makefile.am ephoto.c ephoto.h ephoto_browsing.c 
ephoto_dialogs.c ephoto_edit_view.c ephoto_list_view.c 
ephoto_main.c ephoto_normal_view.c ephoto_single_view.c 
Added Files:
ephoto_browser.c 


Log Message:
Several cleanups, changes. The browser is now in its own window.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 9 Sep 2007 19:31:27 -   1.10
+++ Makefile.am 14 Sep 2007 18:02:27 -  1.11
@@ -7,6 +7,7 @@
 
 ephoto_SOURCES = ephoto.c \
  ephoto_browsing.c \
+ ephoto_browser.c \
  ephoto_database.c \
  ephoto_dialogs.c \
  ephoto_edit_view.c \
@@ -21,9 +22,9 @@
  ephoto_slideshow.c \
  ephoto_utils.c
 
-ephoto_CFLAGS = @EWL_CFLAGS@ @SQLITE_CFLAGS@ @EXIF_CFLAGS@ -Wall
+ephoto_CFLAGS = @EWL_CFLAGS@ @SQLITE_CFLAGS@ @EXIF_CFLAGS@ 
@EFREET_MIME_CFLAGS@ -Wall
 
-ephoto_LDADD =  @EWL_LIBS@ @SQLITE_LIBS@ @EXIF_LIBS@
+ephoto_LDADD =  @EWL_LIBS@ @SQLITE_LIBS@ @EXIF_LIBS@ @EFREET_MIME_LIBS@
 
 EXTRA_DIST = \
 ephoto.h
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ephoto.c25 Jul 2007 17:00:53 -  1.7
+++ ephoto.c14 Sep 2007 18:02:27 -  1.8
@@ -2,11 +2,6 @@
 
 int main(int argc, char **argv)
 {
-   char *album, *name, *description, *path, input;
-   int i;
-   Ecore_List *albums, *images;
-   sqlite3 *db;
-
/*Check to make sure EWL is accessible*/
 if (!ewl_init(argc, argv))
 {
@@ -14,276 +9,6 @@
 return 1;
 }
 
-   for(i = 0; i  argc; i++)
-   {
-   if(!strcmp(argv[i], --help) || !strcmp(argv[i], -h))
-   {
-   printf(Ephoto Version %s Help Page\n, VERSION);
-   printf(Long Commands: \n
-   --help -   This Screen\n
-   --add-album %%s %%s-   Adds Album\n
-  arg1 = name of 
album\n
-  arg2 = 
description of album\n
-   --add-image %%s %%s %%s-   Adds 
Image\n
-  arg1 = name of 
album to add image to\n
-  arg2 = 
descriptive name for image\n
-  arg3 = path to 
the image\n
-   --add-image-dir %%s %%s-   Adds 
All Images From Directory\n
-  arg1 = name of 
album to add images to\n
-  arg2 = 
directory to get images from\n  
-   --list-albums  -   List Albums\n
-   --list-images %%s  -   List Images in 
Album\n
-  arg1 = name of 
album to list images from\n
-   --remove-album %%s -   Removes Album\n
-  arg1 = name of 
album\n
-   --remove-image %%s %%s -   Removes Image\n
-  arg1 = name of 
album to remove image from\n
-  arg2 = path of 
the image to be removed\n);
-   printf(Short Commands: \n
-   -h -   This Screen\n
-   -a %%s %%s -   Adds Album\n
-   -i %%s %%s %%s -   Adds Image\n
-   -id %%s %%s-   Adds all Images 
From Directory\n
-   -la-   List Albums\n
-   -li %%s-   List 
Images in Album\n
-   -ra %%s-   Removes 
Album\n
-   -ri %%s %%s-   Removes 
Image\n);
-   return 0;
-   }
-   if(!strcmp(argv[i], --add-album) || !strcmp(argv[i], -a))
-   {
-   i++;
-

E CVS: apps/ephoto titan

2007-09-14 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/images


Modified Files:
Makefile.am 
Added Files:
photo_lens.png 


Log Message:
More cleanups and work. Also the About window now looks much better thanks to 
an image from tokyo.

===
RCS file: /cvs/e/e17/apps/ephoto/data/images/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 10 Jun 2007 22:37:18 -  1.6
+++ Makefile.am 14 Sep 2007 18:23:38 -  1.7
@@ -19,6 +19,7 @@
media-seek-backward.png \
media-seek-forward.png \
normal_view.png \
+   photo_lens.png \
preferences-system.png \
redo.png \
remove.png \



-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-09-09 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
Makefile.am 


Log Message:
I'm back! Lets not error on warnings. Still expose them, just not 
error.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 31 May 2007 06:02:36 -  1.9
+++ Makefile.am 9 Sep 2007 19:31:27 -   1.10
@@ -21,7 +21,7 @@
  ephoto_slideshow.c \
  ephoto_utils.c
 
-ephoto_CFLAGS = @EWL_CFLAGS@ @SQLITE_CFLAGS@ @EXIF_CFLAGS@ -Wall -Werror
+ephoto_CFLAGS = @EWL_CFLAGS@ @SQLITE_CFLAGS@ @EXIF_CFLAGS@ -Wall
 
 ephoto_LDADD =  @EWL_LIBS@ @SQLITE_LIBS@ @EXIF_LIBS@
 



-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-16 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_normal_view.c 


Log Message:
Add more width to the slider.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_normal_view.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ephoto_normal_view.c10 Jun 2007 21:11:29 -  1.17
+++ ephoto_normal_view.c16 Jun 2007 06:46:28 -  1.18
@@ -48,7 +48,7 @@
ewl_container_child_append(EWL_CONTAINER(em-fbox_vbox), 
em-fthumb_size);
ewl_callback_append(em-fthumb_size, EWL_CALLBACK_VALUE_CHANGED, 
change_size, NULL);
ewl_object_alignment_set(EWL_OBJECT(em-fthumb_size), 
EWL_FLAG_ALIGN_RIGHT);
-   ewl_object_maximum_size_set(EWL_OBJECT(em-fthumb_size), 100, 25);
+   ewl_object_maximum_size_set(EWL_OBJECT(em-fthumb_size), 160, 20);
ewl_widget_show(em-fthumb_size);
 
return em-fbox_vbox;



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-16 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_imaging.c 


Log Message:
Fix the alpha issues with grayscale and sepia conversions, thanks 
rasties and rephorm

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ephoto_imaging.c31 May 2007 06:02:36 -  1.17
+++ ephoto_imaging.c17 Jun 2007 03:21:51 -  1.18
@@ -290,7 +290,16 @@
r = (int)((im_data[i]  16)  0xff);
a = (int)((im_data[i]  24)  0xff);
 
+   if (a  0  a  255)
+   {
+   b = b * (255 / a);
+   g = g * (255 / a);
+   r = r * (255 / a);
+   }
+
gray = (int)((0.3 * r) + (0.59 * g) + (0.11 * b));
+
+   if (a = 0  a  255) gray = (gray * a) / 255;

im_data_new[i] = (a  24) | (gray  16) | (gray  8) | gray;
 }
@@ -313,6 +322,13 @@
 g = (int)((im_data[i]  8)  0xff);
 r = (int)((im_data[i]  16)  0xff);
 a = (int)((im_data[i]  24)  0xff);
+
+   if (a  0  a  255)
+   {
+   b = b * (255 / a);
+   g = g * (255 / a);
+   r = r * (255 / a);
+   }

rr = (int)(((r + g + b)/3)+40);
if (rr  0) rr = 0;
@@ -323,6 +339,13 @@
bb = (int)(((r + g + b)/3)+2);  
if (bb  0) bb = 0;
if (bb  255) bb = 255;
+
+   if (a = 0  a  255)
+   {
+   rr = (rr * a) / 255;
+   gg = (gg * a) / 255;
+   bb = (bb * a) / 255;
+   }
 
 im_data_new[i] = (a  24) | (rr  16) | (gg  8) | bb;
 }



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_main.c ephoto_normal_view.c 


Log Message:
Make the slider fixed size, and aligned to the right.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- ephoto_main.c   9 Jun 2007 16:04:10 -   1.42
+++ ephoto_main.c   10 Jun 2007 21:11:29 -  1.43
@@ -135,7 +135,7 @@

add_edit_view(em-edit_vbox);
 
-   em-view = add_box(em-main_vbox, EWL_ORIENTATION_HORIZONTAL, 2);
+   em-view = add_box(em-main_vbox, EWL_ORIENTATION_HORIZONTAL, 1);
ewl_object_fill_policy_set(EWL_OBJECT(em-view), EWL_FLAG_FILL_ALL);
 
em-browser = ewl_notebook_new();
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_normal_view.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ephoto_normal_view.c1 Jun 2007 21:46:19 -   1.16
+++ ephoto_normal_view.c10 Jun 2007 21:11:29 -  1.17
@@ -47,6 +47,8 @@
ewl_range_value_set(EWL_RANGE(em-fthumb_size), 64);
ewl_container_child_append(EWL_CONTAINER(em-fbox_vbox), 
em-fthumb_size);
ewl_callback_append(em-fthumb_size, EWL_CALLBACK_VALUE_CHANGED, 
change_size, NULL);
+   ewl_object_alignment_set(EWL_OBJECT(em-fthumb_size), 
EWL_FLAG_ALIGN_RIGHT);
+   ewl_object_maximum_size_set(EWL_OBJECT(em-fthumb_size), 100, 25);
ewl_widget_show(em-fthumb_size);
 
return em-fbox_vbox;



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_slideshow.c 


Log Message:
Black background for slideshows! Probably one of the most requested features.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_slideshow.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ephoto_slideshow.c  15 May 2007 16:44:07 -  1.5
+++ ephoto_slideshow.c  10 Jun 2007 21:46:36 -  1.6
@@ -41,7 +41,6 @@
ecore_dlist_goto_first(em-images);
image_path = ecore_dlist_current(em-images);
 
-   ewl_container_reset(EWL_CONTAINER(w));
ewl_image_file_set(EWL_IMAGE(w), image_path, NULL);
 
change = ecore_timer_add(5, change_picture, w);
@@ -56,6 +55,10 @@
win = add_window(Ephoto Slideshow!, 0, 0, destroy, NULL);
ewl_window_fullscreen_set(EWL_WINDOW(win), 1);
ewl_callback_append(win, EWL_CALLBACK_CLICKED, destroy, NULL);
+
+   image = add_image(win, PACKAGE_DATA_DIR /images/black.png, 0, NULL, 
NULL);
+   ewl_image_proportional_set(EWL_IMAGE(image), FALSE);
+ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_ALL);
 
cell = ewl_cell_new();
ewl_object_fill_policy_set(EWL_OBJECT(cell), EWL_FLAG_FILL_ALL);



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto/images


Removed Files:
Makefile.am button.png button_clicked.png combo_arrows.png 
entry.png entry_focus.png hseparator.png images.edc 
scrollpane_bg.png seeker.png seeker_bg.png seeker_h.png 
sf_barh1.png sf_barh1_h.png sf_barh_thumb.png sf_barv1.png 
sf_barv1_h.png sf_barv_thumb.png sf_btd1.png sf_btd1d.png 
sf_btl1.png sf_btl1d.png sf_btr1.png sf_btr1d.png sf_btu1.png 
sf_btu1d.png sf_hb_runner.png sf_vb_runner.png shadow.png 
vseparator.png 


Log Message:
Remove the themes/* stuff as it isn't used anymore. Updata the TODO. Complete 
the move to a black slideshow background.




-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto


Removed Files:
AUTHORS COPYING Makefile.am main.edc 


Log Message:
Remove the themes/* stuff as it isn't used anymore. Updata the TODO. Complete 
the move to a black slideshow background.




-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto/bits


Removed Files:
Makefile.am button.edc combo.edc entry.edc label.edc 
scrollbar.edc scrollpane.edc seeker.edc separator.edc 
shadow.edc spacer.edc text.edc tree.edc window.edc 


Log Message:
Remove the themes/* stuff as it isn't used anymore. Updata the TODO. Complete 
the move to a black slideshow background.




-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto/fonts


Removed Files:
AUTHORS DejaVuSansMono-Bold.ttf DejaVuSansMono-BoldOblique.ttf 
DejaVuSansMono-Oblique.ttf DejaVuSansMono.ttf 
DejaVuSerif-Bold.ttf DejaVuSerif-BoldOblique.ttf 
DejaVuSerif-Oblique.ttf DejaVuSerif.ttf LICENSE Makefile.am 


Log Message:
Remove the themes/* stuff as it isn't used anymore. Updata the TODO. Complete 
the move to a black slideshow background.




-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto


Modified Files:
TODO configure.in 


Log Message:
Remove the themes/* stuff as it isn't used anymore. Updata the TODO. Complete 
the move to a black slideshow background.

===
RCS file: /cvs/e/e17/apps/ephoto/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- TODO11 May 2007 22:50:37 -  1.3
+++ TODO10 Jun 2007 22:37:18 -  1.4
@@ -12,16 +12,17 @@
 ===General===
 Dialogs For Adding/Removing Albums/Images.
 DRAG AND DROP IS A MUST!
+Keybindings
 ===Layout===
 Ideas and Changes are welcome!
 ===Normal View===
-Seeker to Resize Thumbnails.
+-
 ===Edit View===
 Add Editing Controls(Zooms/Color Enhancement/Histogram/Cropping/etc..).
-Add Saving Ability(This will include looking into editing and saving exif 
data).
+Better  Saving Ability(This will include looking into editing and saving exif 
data).
 Should we list navigation for other images better?(than using buttons with 
arrows)
 ===Single View===
 Should we list navigation for other images better?(than using buttons with 
arrwos)
 ===Slideshow===
 Need to Add Configuration to Slideshows..
-Should Slideshow Backgrounds be black?
+
===
RCS file: /cvs/e/e17/apps/ephoto/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- configure.in29 Mar 2007 14:21:51 -  1.8
+++ configure.in10 Jun 2007 22:37:18 -  1.9
@@ -148,11 +148,6 @@
 ephoto.spec
 data/Makefile
 data/images/Makefile
-data/themes/Makefile
-data/themes/ephoto/Makefile
-data/themes/ephoto/bits/Makefile
-data/themes/ephoto/fonts/Makefile
-data/themes/ephoto/images/Makefile
 po/Makefile
 src/Makefile
 src/bin/Makefile



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data


Modified Files:
Makefile.am 


Log Message:
Remove the themes/* stuff as it isn't used anymore. Updata the TODO. Complete 
the move to a black slideshow background.

===
RCS file: /cvs/e/e17/apps/ephoto/data/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 23 Mar 2007 23:50:50 -  1.2
+++ Makefile.am 10 Jun 2007 22:37:18 -  1.3
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in Makefile
 
-SUBDIRS = images themes
+SUBDIRS = images



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-10 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/images


Modified Files:
Makefile.am 
Added Files:
black.png 


Log Message:
Remove the themes/* stuff as it isn't used anymore. Updata the TODO. Complete 
the move to a black slideshow background.

===
RCS file: /cvs/e/e17/apps/ephoto/data/images/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 26 May 2007 00:15:17 -  1.5
+++ Makefile.am 10 Jun 2007 22:37:18 -  1.6
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in Makefile
 
 FILES = add.png \
+   black.png \
camera-photo.png \
dialog-close.png \
edit_view.png \
@@ -22,7 +23,7 @@
redo.png \
remove.png \
search.png \
-stock_fullscreen.png \
+   stock_fullscreen.png \
stock_help.png \
stock_save.png \
stock_save-as.png \



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-09 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_main.c 


Log Message:
Fix the slider when dealing with albums.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ephoto_main.c   1 Jun 2007 21:46:19 -   1.41
+++ ephoto_main.c   9 Jun 2007 16:04:10 -   1.42
@@ -296,7 +296,8 @@
{
thumb = add_image(em-fbox, imagef, 1, 
freebox_image_clicked, NULL);
-   ewl_image_constrain_set(EWL_IMAGE(thumb), 81); 
+   ewl_image_constrain_set(EWL_IMAGE(thumb), 
+   
ewl_range_value_get(EWL_RANGE(em-fthumb_size))); 
ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
ewl_widget_name_set(thumb, imagef);



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-06-01 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_main.c ephoto_normal_view.c 


Log Message:
Various cleanups and fixes.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ephoto_main.c   31 May 2007 07:11:28 -  1.40
+++ ephoto_main.c   1 Jun 2007 21:46:19 -   1.41
@@ -58,7 +58,6 @@
 {
ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-main_nb), em-main_vbox);
ewl_widget_disable(em-smi);
-   ecore_dlist_goto_first(em-images);
 }
 
 /*Update the images based on the current tab*/
@@ -169,12 +168,9 @@
 
add_list_view(em-view_box);
 
-   em-toolbar = ewl_hbox_new();
-   ewl_box_spacing_set(EWL_BOX(em-toolbar), 5);
+   em-toolbar = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 5);
ewl_object_alignment_set(EWL_OBJECT(em-toolbar), 
EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(em-toolbar), 
EWL_FLAG_FILL_SHRINK);
-   ewl_container_child_append(EWL_CONTAINER(vbox), em-toolbar);
-   ewl_widget_show(em-toolbar);
 
 button = add_button(em-toolbar, NULL, 
PACKAGE_DATA_DIR /images/normal_view.png, 
@@ -248,12 +244,14 @@
em-db = ephoto_db_init();
 
em-current_album = strdup(_(Complete Library));
-   em-current_directory = strdup(getcwd(buf, PATH_MAX));
+
+   getcwd(buf, PATH_MAX);
+   buf[sizeof(buf)-1] = '\0';
+   em-current_directory = strdup(buf);
 
populate_albums(NULL, NULL, NULL);
ewl_callback_append(em-browser, EWL_CALLBACK_VALUE_CHANGED, 
update_view, NULL);
-
return;
 }
 
@@ -275,14 +273,15 @@
{
ecore_list_destroy(em-albums);
}
-   if (!ecore_list_is_empty(em-images))
-   {
-   ecore_dlist_destroy(em-images);
-   }
 
em-albums = ecore_list_new();
em-albums = ephoto_db_list_albums(em-db);
ewl_mvc_data_set(EWL_MVC(em-atree), em-albums);
+
+if (!ecore_dlist_is_empty(em-images))
+{
+ecore_dlist_destroy(em-images);
+}

em-images = ecore_dlist_new();
em-images = ephoto_db_list_images(em-db, em-current_album);
@@ -297,19 +296,25 @@
{
thumb = add_image(em-fbox, imagef, 1, 
freebox_image_clicked, NULL);
-   ewl_image_constrain_set(EWL_IMAGE(thumb), 
-   
ewl_range_value_get(EWL_RANGE(em-fthumb_size))); 
+   ewl_image_constrain_set(EWL_IMAGE(thumb), 81); 
ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
ewl_widget_name_set(thumb, imagef);
}
ecore_dlist_next(em-images);
 }
-   ewl_widget_configure(em-fbox);
-   ecore_dlist_goto_first(em-images);
-ewl_mvc_data_set(EWL_MVC(em-ltree), em-images);
+   ewl_widget_configure(em-fbox_vbox);
+   
+   ewl_mvc_data_set(EWL_MVC(em-ltree), em-images);
ecore_dlist_goto_first(em-images);
 
+   if (ecore_dlist_current(em-images))
+{
+ewl_image_file_path_set(EWL_IMAGE(em-simage),
+ecore_dlist_current(em-images));
+}
+
+
return;
 }
 
@@ -356,8 +361,7 @@
{
thumb = add_image(em-fbox, imagef, 1, 
freebox_image_clicked, NULL);
-   ewl_image_size_set(EWL_IMAGE(thumb), 
-   
ewl_range_value_get(EWL_RANGE(em-fthumb_size)), 
+   ewl_image_constrain_set(EWL_IMAGE(thumb), 

ewl_range_value_get(EWL_RANGE(em-fthumb_size)));
ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
@@ -365,10 +369,16 @@
}
ecore_dlist_next(em-images);
}
-   ewl_widget_configure(em-fbox);
-   ecore_dlist_goto_first(em-images);
+   ewl_widget_configure(em-fbox_vbox);
+
ewl_mvc_data_set(EWL_MVC(em-ltree), em-images);
ecore_dlist_goto_first(em-images); 
+
+   if (ecore_dlist_current(em-images)) 
+   {
+   ewl_image_file_path_set(EWL_IMAGE(em-simage), 
+   ecore_dlist_current(em-images));
+   }
 
return;
 } 
===
RCS file:

E CVS: apps/ephoto titan

2007-05-31 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
Makefile.am ephoto.h ephoto_edit_view.c ephoto_imaging.c 
ephoto_list_view.c ephoto_main.c ephoto_normal_view.c 
ephoto_single_view.c 
Added Files:
ephoto_dialogs.c 


Log Message:
Add a new file that separates out dialogs. This is cleaner. Cleanup some code.
Ephoto will now open with its file system in the current working directory!

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 19 Apr 2007 03:17:11 -  1.8
+++ Makefile.am 31 May 2007 06:02:36 -  1.9
@@ -8,6 +8,7 @@
 ephoto_SOURCES = ephoto.c \
  ephoto_browsing.c \
  ephoto_database.c \
+ ephoto_dialogs.c \
  ephoto_edit_view.c \
  ephoto_exif.c \
  ephoto_gui.c \
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ephoto.h24 May 2007 19:27:07 -  1.24
+++ ephoto.h31 May 2007 06:02:36 -  1.25
@@ -80,6 +80,10 @@
 Ewl_Widget *add_shadow(Ewl_Widget *c);
 Ewl_Widget *add_window(char *name, int width, int height, void *cb, void 
*data);
 
+/* Ephoto Dialogs */
+void about_dialog(Ewl_Widget *w, void *event, void *data);
+void add_album(Ewl_Widget *w, void *event, void *data);
+
 /* Ephoto Imaging */
 unsigned int *flip_horizontal(Ewl_Widget *image);
 unsigned int *flip_vertical(Ewl_Widget *image);
@@ -117,6 +121,8 @@
 /* Ephoto Main View */
 void show_main_view(Ewl_Widget *w, void *event, void *data);
 void show_edit_view(Ewl_Widget *w, void *event, void *data);
+void populate_albums(Ewl_Widget *w, void *event, void *data);
+void populate_directories(Ewl_Widget *w, void *event, void *data);
 
 /* Ephoto Viewer Views */
 void show_normal_view(Ewl_Widget *w, void *event, void *data);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ephoto_edit_view.c  25 May 2007 20:55:53 -  1.24
+++ ephoto_edit_view.c  31 May 2007 06:02:36 -  1.25
@@ -7,7 +7,6 @@
 static void next_image(Ewl_Widget *w, void *event, void *data);
 static void zoom_in(Ewl_Widget *w, void *event, void *data);
 static void zoom_out(Ewl_Widget *w, void *event, void *data);
-//static void zoom_full(Ewl_Widget *w, void *event, void *data);
 static void flip_image_horizontal(Ewl_Widget *w, void *event, void *data);
 static void flip_image_vertical(Ewl_Widget *w, void *event, void *data);
 static void rotate_image_left(Ewl_Widget *w, void *event, void *data);
@@ -16,8 +15,8 @@
 static void image_sharpen(Ewl_Widget *w, void *event, void *data);
 static void image_grayscale(Ewl_Widget *w, void *event, void *data);
 static void image_sepia(Ewl_Widget *w, void *event, void *data);
-//static void close_channel(Ewl_Widget *w, void *event, void *data);
-//static void channel_mixer(Ewl_Widget *w, void *event, void *data);
+static void close_channel(Ewl_Widget *w, void *event, void *data);
+static void channel_mixer(Ewl_Widget *w, void *event, void *data);
 
 /*Add the edit view*/
 Ewl_Widget *add_edit_view(Ewl_Widget *c)
@@ -100,11 +99,6 @@
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
-   //button = add_button(c, Zoom 1:1, PACKAGE_DATA_DIR 
/images/search.png, zoom_full, NULL);
-ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
-ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
-ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
-
button = add_button(c, Rotate Left, PACKAGE_DATA_DIR 
/images/undo.png, rotate_image_left, NULL);
ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
@@ -153,9 +147,9 @@
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
-/* button = add_button(c, Channel Editor, NULL, channel_mixer, NULL);
+   button = add_button(c, Channel Editor, NULL, channel_mixer, NULL);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
-ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);*/
+ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
return;
 }
@@ -203,7 +197,7 @@

ewl_object_current_size_get(EWL_OBJECT(em-eimage), ow, oh);
 
-

E CVS: apps/ephoto titan

2007-05-31 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_main.c ephoto_normal_view.c 


Log Message:
Add a slider for resizing the thumbnails!

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ephoto_main.c   31 May 2007 06:02:36 -  1.39
+++ ephoto_main.c   31 May 2007 07:11:28 -  1.40
@@ -297,7 +297,8 @@
{
thumb = add_image(em-fbox, imagef, 1, 
freebox_image_clicked, NULL);
-   ewl_image_constrain_set(EWL_IMAGE(thumb), 81);
+   ewl_image_constrain_set(EWL_IMAGE(thumb), 
+   
ewl_range_value_get(EWL_RANGE(em-fthumb_size))); 
ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
ewl_widget_name_set(thumb, imagef);
@@ -355,7 +356,9 @@
{
thumb = add_image(em-fbox, imagef, 1, 
freebox_image_clicked, NULL);
-   ewl_image_constrain_set(EWL_IMAGE(thumb), 81);
+   ewl_image_size_set(EWL_IMAGE(thumb), 
+   
ewl_range_value_get(EWL_RANGE(em-fthumb_size)), 
+   
ewl_range_value_get(EWL_RANGE(em-fthumb_size)));
ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
ewl_widget_name_set(thumb, imagef);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_normal_view.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ephoto_normal_view.c31 May 2007 06:02:36 -  1.14
+++ ephoto_normal_view.c31 May 2007 07:11:28 -  1.15
@@ -1,7 +1,25 @@
 #include ephoto.h
 
+static void change_size(Ewl_Widget *w, void *event, void *data);
 static void iterate(char *point2);
 
+/*Change the thumb size*/
+static void change_size(Ewl_Widget *w, void *event, void *data)
+{
+   Ewl_Widget *child;
+
+   ewl_container_child_iterate_begin(EWL_CONTAINER(em-fbox));
+
+   while ((child = ewl_container_child_next(EWL_CONTAINER(em-fbox
+   {
+   ewl_image_constrain_set(EWL_IMAGE(child), 
+   
ewl_range_value_get(EWL_RANGE(em-fthumb_size)));
+   ewl_widget_reparent(child);
+   }
+
+   return;
+}
+
 /*Add the normal view*/
 Ewl_Widget *add_normal_view(Ewl_Widget *c)
 {
@@ -20,6 +38,15 @@
 ewl_object_fill_policy_set(EWL_OBJECT(em-fbox), EWL_FLAG_FILL_ALL);
 ewl_container_child_append(EWL_CONTAINER(sp), em-fbox);
 ewl_widget_show(em-fbox);
+
+   em-fthumb_size = ewl_hseeker_new();
+   ewl_range_minimum_value_set(EWL_RANGE(em-fthumb_size), 8);
+   ewl_range_maximum_value_set(EWL_RANGE(em-fthumb_size), 128);
+   ewl_range_step_set(EWL_RANGE(em-fthumb_size), 8);
+   ewl_range_value_set(EWL_RANGE(em-fthumb_size), 64);
+   ewl_container_child_append(EWL_CONTAINER(em-fbox_vbox), 
em-fthumb_size);
+   ewl_callback_append(em-fthumb_size, EWL_CALLBACK_VALUE_CHANGED, 
change_size, NULL);
+   ewl_widget_show(em-fthumb_size);
 
return em-fbox_vbox;
 }



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-31 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h 


Log Message:
Whoops, your going to need this to make the thumb seeker work!

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ephoto.h31 May 2007 06:02:36 -  1.25
+++ ephoto.h31 May 2007 07:15:52 -  1.26
@@ -146,8 +146,10 @@
Ewl_Widget *eimage;
Ewl_Widget *fbox_vbox;
Ewl_Widget *fbox;
+   Ewl_Widget *fthumb_size;
Ewl_Widget *list_vbox;
Ewl_Widget *ltree;
+   Ewl_Widget *lthumb_size;
Ewl_Widget *main_nb;
Ewl_Widget *main_vbox;
Ewl_Widget *simage;



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-27 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/images


Added Files:
stock_save-as.png 


Log Message:
Whoops Add the image!




-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-26 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_main.c 


Log Message:
Small button fill/alignment fix for the exif button.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ephoto_main.c   26 May 2007 00:15:17 -  1.37
+++ ephoto_main.c   27 May 2007 03:22:16 -  1.38
@@ -86,6 +86,7 @@
{
populate_directories(NULL, NULL, NULL);
}
+   ecore_dlist_goto_first(em-images);
 
return;
 }
@@ -312,8 +313,8 @@
NULL, NULL);
 ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
 ewl_attach_tooltip_text_set(button, _(You do not have libexif 
0.6.13));
-ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
-ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
+ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
+ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
 #ifdef BUILD_EXIF_SUPPORT
 ewl_callback_append(button, EWL_CALLBACK_CLICKED, display_exif_dialog, 
NULL);
@@ -386,7 +387,6 @@
em-albums = ecore_list_new();
em-albums = ephoto_db_list_albums(em-db);
ewl_mvc_data_set(EWL_MVC(em-atree), em-albums);
-   ewl_mvc_dirty_set(EWL_MVC(em-atree), 1);

em-images = ecore_dlist_new();
em-images = ephoto_db_list_images(em-db, em-current_album);
@@ -410,13 +410,8 @@
 }
ewl_widget_configure(em-fbox);
ecore_dlist_goto_first(em-images);
-   if(ecore_dlist_current(em-images)) 
-   {
-   ewl_image_file_path_set(EWL_IMAGE(em-simage), 
-   ecore_dlist_current(em-images));
-   }
 ewl_mvc_data_set(EWL_MVC(em-ltree), em-images);
-   ewl_mvc_dirty_set(EWL_MVC(em-ltree), 1);
+   ecore_dlist_goto_first(em-images);
 
return;
 }
@@ -445,7 +440,6 @@
 
ecore_dlist_goto_first(em-directories);
 ewl_mvc_data_set(EWL_MVC(em-dtree), em-directories);
-ewl_mvc_dirty_set(EWL_MVC(em-dtree), 1);
 
if (!ecore_list_is_empty(em-images))
{
@@ -474,14 +468,9 @@
}
ewl_widget_configure(em-fbox);
ecore_dlist_goto_first(em-images);
-   if(ecore_dlist_current(em-images))
-   { 
-   ewl_image_file_path_set(EWL_IMAGE(em-simage), 
-   ecore_dlist_current(em-images));
-   }
ewl_mvc_data_set(EWL_MVC(em-ltree), em-images);
-   ewl_mvc_dirty_set(EWL_MVC(em-ltree), 1);
-   
+   ecore_dlist_goto_first(em-images); 
+
return;
 } 
 



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-25 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_edit_view.c ephoto_imaging.c 


Log Message:
Sepia speedups and fixes. Sepia is tons better now.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ephoto_edit_view.c  23 May 2007 22:02:56 -  1.23
+++ ephoto_edit_view.c  25 May 2007 20:55:53 -  1.24
@@ -16,6 +16,8 @@
 static void image_sharpen(Ewl_Widget *w, void *event, void *data);
 static void image_grayscale(Ewl_Widget *w, void *event, void *data);
 static void image_sepia(Ewl_Widget *w, void *event, void *data);
+//static void close_channel(Ewl_Widget *w, void *event, void *data);
+//static void channel_mixer(Ewl_Widget *w, void *event, void *data);
 
 /*Add the edit view*/
 Ewl_Widget *add_edit_view(Ewl_Widget *c)
@@ -89,37 +91,37 @@
Ewl_Widget *button;
 
button = add_button(c, Zoom In, PACKAGE_DATA_DIR 
/images/search.png, zoom_in, NULL);
-ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
button = add_button(c, Zoom Out, PACKAGE_DATA_DIR 
/images/search.png, zoom_out, NULL);
-ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
//button = add_button(c, Zoom 1:1, PACKAGE_DATA_DIR 
/images/search.png, zoom_full, NULL);
-ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
button = add_button(c, Rotate Left, PACKAGE_DATA_DIR 
/images/undo.png, rotate_image_left, NULL);
-   ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+   ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
 button = add_button(c, Rotate Right, PACKAGE_DATA_DIR 
/images/redo.png, rotate_image_right, NULL);
-ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
 button = add_button(c, Flip Horizontally, PACKAGE_DATA_DIR 
/images/go-next.png, flip_image_horizontal, NULL);
-ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
 button = add_button(c, Flip Vertically, PACKAGE_DATA_DIR 
/images/go-down.png, flip_image_vertical, NULL);
-   ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+   ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
@@ -132,25 +134,29 @@
Ewl_Widget *button;
 
button = add_button(c, Blur Image, NULL, image_blur, NULL);
-   ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+   ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
button = add_button(c, Sharpen Image, NULL, image_sharpen, NULL);
-ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
button = add_button(c, Black and White, NULL, image_grayscale, NULL);
-   ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+   ewl_button_image_size_set(EWL_BUTTON(button), 20, 20);
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
button = add_button(c, Sepia, NULL, image_sepia, NULL);
-

E CVS: apps/ephoto titan

2007-05-25 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_main.c 


Log Message:
Change the size of the tango icons we use, make the .. directory have a 
different image and redo a few of the images.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- ephoto_main.c   24 May 2007 19:27:07 -  1.36
+++ ephoto_main.c   26 May 2007 00:15:17 -  1.37
@@ -205,8 +205,8 @@
 
mb = add_menubar(vbox);
menu = add_menu(mb, File);
-   em-smi = add_menu_item(menu, Save Image, 
-   PACKAGE_DATA_DIR /images/stock_save.png, 
+   em-smi = add_menu_item(menu, Save Image As, 
+   PACKAGE_DATA_DIR /images/stock_save-as.png, 
save_dialog, NULL);
ewl_widget_disable(em-smi);
mi = add_menu_item(menu, Exit, 
@@ -585,6 +585,8 @@
 ewl_object_fill_policy_set(EWL_OBJECT(icon), EWL_FLAG_FILL_ALL);
if (!strncmp(directory, .., 2))
{
+   ewl_icon_image_set(EWL_ICON(icon), PACKAGE_DATA_DIR 
/images/go-up.png, NULL);
+   ewl_icon_constrain_set(EWL_ICON(icon), 25);
ewl_widget_name_set(icon, dirname(current_directory));
}
else



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-25 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/images


Modified Files:
Makefile.am add.png camera-photo.png edit_view.png 
emblem-favorite.png emblem-photos.png exit.png folder.png 
get_exif.png go-down.png go-home.png go-next.png go-up.png 
image.png list_view.png media-seek-backward.png 
media-seek-forward.png normal_view.png preferences-system.png 
redo.png remove.png search.png stock_fullscreen.png 
stock_save.png undo.png x-office-presentation.png 


Log Message:
Change the size of the tango icons we use, make the .. directory have a 
different image and redo a few of the images.

===
RCS file: /cvs/e/e17/apps/ephoto/data/images/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 24 May 2007 19:53:26 -  1.4
+++ Makefile.am 26 May 2007 00:15:17 -  1.5
@@ -25,6 +25,7 @@
 stock_fullscreen.png \
stock_help.png \
stock_save.png \
+   stock_save-as.png \
undo.png \
x-office-presentation.png
 imagedir = $(pkgdatadir)/images
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/add.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsTqWQWt and /tmp/cvsBdqlQN differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/camera-photo.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsBa0Gkx and /tmp/cvsT6eLfR differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/edit_view.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsvmQa1v and /tmp/cvsFNIWXP differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/emblem-favorite.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsjD9Poz and /tmp/cvsnG9dnT differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/emblem-photos.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsdDrhrC and /tmp/cvs5g7iuW differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/exit.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvs14azmB and /tmp/cvsdr1lrV differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/folder.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsrLrdwE and /tmp/cvsZXIACY differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/get_exif.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsMuLr5v and /tmp/cvs05lsdQ differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/go-down.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsCQRCRu and /tmp/cvsQQkf1O differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/go-home.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsksgMhy and /tmp/cvs4TzYsS differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/go-next.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsi2J9Yw and /tmp/cvsIScZbR differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/go-up.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvs6m5noW and /tmp/cvsO7Trbh differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/image.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvs8okFiV and /tmp/cvsaDhA7f differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/list_view.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsKBuo4Y and /tmp/cvsu7pKVj differ
===
RCS file: /cvs/e/e17/apps/ephoto/data/images/media-seek-backward.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files

E CVS: apps/ephoto titan

2007-05-24 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_imaging.c ephoto_main.c 


Log Message:
Sepia works pretty well now, I do believe.  Added a contrast formula based on 
imlib2, and soon to add a brightness one.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ephoto.h23 May 2007 22:02:56 -  1.23
+++ ephoto.h24 May 2007 19:27:07 -  1.24
@@ -21,6 +21,7 @@
 #include stdio.h
 #include stdlib.h
 #include string.h
+#include sys/types.h
 #include time.h
 #include unistd.h
 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto_imaging.c23 May 2007 22:02:56 -  1.13
+++ ephoto_imaging.c24 May 2007 19:27:07 -  1.14
@@ -1,7 +1,20 @@
 #include ephoto.h
 
-static void rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v);
-static void hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b);
+#define R_CMOD(r) \
+red[(int)(r)]
+#define G_CMOD(g) \
+green[(int)(g)]
+#define B_CMOD(b) \
+blue[(int)(b)] \
+/*#define A_CMOD(a) \
+alpha[(int)(a)]*/
+
+#define A_VAL(p) ((unsigned char *)(p))[3]
+#define R_VAL(p) ((unsigned char *)(p))[2]
+#define G_VAL(p) ((unsigned char *)(p))[1]
+#define B_VAL(p) ((unsigned char *)(p))[0]
+
+static unsigned int *set_contrast(unsigned int *data, int ew, int eh, float v);
 
 static void close_dialog(Ewl_Widget *w, void *event, void *data);
 static void close_progress(Ewl_Widget *w, void *event, void *data);
@@ -10,108 +23,51 @@
 
 static Ewl_Widget *save_win, *qseek;
 
-static void rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v)
+static unsigned int *set_contrast(unsigned int *data, int ew, int eh, float v)
 {
-   int delta, min, max;
-
-   max = (r + g + abs(r - g)) / 2;
-   max = (max + b + abs(max - b)) / 2;
-   min = (r + g - abs(r - g)) / 2;
-   min = (min + b - abs(min - b)) / 2;
-
-   delta = max - min;
-   *v = (float)(100 * max) / 255.0;
-
-   if (max != 0) *s = (float)(100 * delta) / (float)max;
-
-   else
-   {
-   *s = 0.0;
-   *h = 0.0;
-   *v = 0.0;
-   }
-
-   if (r == max) *h = (float)(100 * (g - b)) / (float)(6.0 * delta);
-
-   else
-   {
-   if (g == max) *h = (float)(100 * (2 * delta + b - r)) / 
(float)(6.0 * delta);
-   else *h = (float)(100 * (4 * delta + r - g)) / (float)(6.0 * 
delta);
-   }
-   if (*h  0.0) *h += 100.0;
-   if (*h  100.0) *h -= 100.0;
+   int i, val;
+   unsigned int *p;
+   unsigned char red[256], green[256], blue[256], alpha[256];
 
-   return;
-}
-
-static void hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b)
-{
-   float hh, f, p, q, t;
-   int i;
+for (i = 0; i  256; i++)
+{
+red[i] = (unsigned char)i;
+green[i] = (unsigned char)i;
+blue[i] = (unsigned char)i;
+alpha[i] = (unsigned char)i;
+}
+for (i = 0; i  256; i++)
+{
+val = (int)(((double)red[i] - 127) * v) + 127;
+if (val  0) val = 0;
+if (val  255) val = 255;
+red[i] = (unsigned char)val;
+
+val = (int)(((double)green[i] - 127) * v) + 127;
+if (val  0) val = 0;
+if (val  255) val = 255;
+green[i] = (unsigned char)val;
+
+val = (int)(((double)blue[i] - 127) * v) + 127;
+if (val  0) val = 0;
+if (val  255) val = 255;
+blue[i] = (unsigned char)val;
+
+val = (int)(((double)alpha[i] - 127) * v) + 127;
+if (val  0) val = 0;
+if (val  255) val = 255;
+alpha[i] = (unsigned char)val;
+}
+for (i = 0; i  (ew * eh); i++)
+{
+p = data[i];
 
-   if (s == 0.0)
-   {
-   *r = (int)(((v * 255.0) / 100.0) + 0.5);
-   *g = (int)(((v * 255.0) / 100.0) + 0.5);
-   *b = (int)(((v * 255.0) / 100.0) + 0.5);
-   
-   return;
+R_VAL(p) = R_CMOD(R_VAL(p));
+G_VAL(p) = G_CMOD(G_VAL(p));
+B_VAL(p) = B_CMOD(B_VAL(p));
+  //  A_VAL(p) = A_CMOD(A_VAL(p));
}
-   
-   hh = (h * 6.0) / 100.0;
-   i = floor(hh);
-   f = hh - (float)i;
-
-   p = v * (1.0 - s / 100.0) / 100.0;
-   q = v * (1.0 - (s * f) / 100.0) / 100.0;
-   t = v * (1.0 - s * (1.0 - f) / 100.0) / 100.0;
-
-   switch (i)
-

E CVS: apps/ephoto titan

2007-05-24 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/images


Added Files:
stock_help.png 


Log Message:
Don't forget to add the image!




-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-24 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/images


Modified Files:
Makefile.am 


Log Message:
And add it to the Makefile!

===
RCS file: /cvs/e/e17/apps/ephoto/data/images/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 23 Mar 2007 23:50:50 -  1.3
+++ Makefile.am 24 May 2007 19:53:26 -  1.4
@@ -23,6 +23,7 @@
remove.png \
search.png \
 stock_fullscreen.png \
+   stock_help.png \
stock_save.png \
undo.png \
x-office-presentation.png



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-24 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_imaging.c 


Log Message:
Work on sepia a little more.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ephoto_imaging.c24 May 2007 19:27:07 -  1.14
+++ ephoto_imaging.c24 May 2007 22:43:03 -  1.15
@@ -14,7 +14,7 @@
 #define G_VAL(p) ((unsigned char *)(p))[1]
 #define B_VAL(p) ((unsigned char *)(p))[0]
 
-static unsigned int *set_contrast(unsigned int *data, int ew, int eh, float v);
+//static unsigned int *set_contrast(unsigned int *data, int ew, int eh, float 
v);
 
 static void close_dialog(Ewl_Widget *w, void *event, void *data);
 static void close_progress(Ewl_Widget *w, void *event, void *data);
@@ -23,7 +23,7 @@
 
 static Ewl_Widget *save_win, *qseek;
 
-static unsigned int *set_contrast(unsigned int *data, int ew, int eh, float v)
+/*static unsigned int *set_contrast(unsigned int *data, int ew, int eh, float 
v)
 {
int i, val;
unsigned int *p;
@@ -68,7 +68,7 @@
   //  A_VAL(p) = A_CMOD(A_VAL(p));
}
return data;
-}
+}*/
 
 unsigned int *flip_horizontal(Ewl_Widget *image)
 {
@@ -369,17 +369,15 @@
 
 unsigned int *sepia_image(Ewl_Widget *image)
 {
-   unsigned int *data, *im_data, *im_data_new;
+   unsigned int *im_data, *im_data_new;
int i, r, g, b, a, ew, eh;
float h, s, v;
 
-data = evas_object_image_data_get(EWL_IMAGE(image)-image, FALSE);
+im_data = evas_object_image_data_get(EWL_IMAGE(image)-image, FALSE);
 evas_object_image_size_get(EWL_IMAGE(image)-image, ew, eh);
 
 im_data_new = malloc(sizeof(unsigned int) * ew * eh);
 
-   im_data = set_contrast(data, ew, eh, 2);
-
for (i = 0; i  (ew * eh); i++)
 {
 b = (int)((im_data[i])  0xff);
@@ -388,7 +386,7 @@
 a = (int)((im_data[i]  24)  0xff);
 
 evas_color_rgb_to_hsv(r, g, b, h, s, v);
-evas_color_hsv_to_rgb(35, s, v, r, g, b);
+   evas_color_hsv_to_rgb(35, s, v, r, g, b);
 
 im_data_new[i] = (a  24) | (r  16) | (g  8) | b;
 }



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_edit_view.c ephoto_imaging.c 


Log Message:
Fix black and white conversion with alpha.
Add the beginnings of sepia conversion, it does not work quite right yet 
though, need to work on constrast and brightness functions to get it 
working perfectly.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ephoto.h22 May 2007 23:04:02 -  1.22
+++ ephoto.h23 May 2007 22:02:56 -  1.23
@@ -16,6 +16,7 @@
 
 #include libgen.h
 #include limits.h
+#include math.h
 #include sqlite3.h
 #include stdio.h
 #include stdlib.h
@@ -86,6 +87,7 @@
 unsigned int *blur_image(Ewl_Widget *image);
 unsigned int *sharpen_image(Ewl_Widget *image);
 unsigned int *grayscale_image(Ewl_Widget *image);
+unsigned int *sepia_image(Ewl_Widget *image);
 void update_image(Ewl_Widget *image, int w, int h, unsigned int *data);
 void save_dialog(const char *file);
 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ephoto_edit_view.c  22 May 2007 23:04:02 -  1.22
+++ ephoto_edit_view.c  23 May 2007 22:02:56 -  1.23
@@ -15,6 +15,7 @@
 static void image_blur(Ewl_Widget *w, void *event, void *data);
 static void image_sharpen(Ewl_Widget *w, void *event, void *data);
 static void image_grayscale(Ewl_Widget *w, void *event, void *data);
+static void image_sepia(Ewl_Widget *w, void *event, void *data);
 
 /*Add the edit view*/
 Ewl_Widget *add_edit_view(Ewl_Widget *c)
@@ -145,6 +146,11 @@
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
+   button = add_button(c, Sepia, NULL, image_sepia, NULL);
+ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
+ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
+
return;
 }
 
@@ -332,3 +338,18 @@
 
return;
 }
+
+/*Convert image to Sepia*/
+static void image_sepia(Ewl_Widget *w, void *event, void *data)
+{
+   unsigned int *image_data;
+   int nw, nh;
+
+evas_object_image_size_get(EWL_IMAGE(em-eimage)-image, nw, nh);
+image_data = sepia_image(em-eimage);
+update_image(em-eimage, nw, nh, image_data);
+ewl_widget_configure(em-eimage-parent);
+
+return;
+}
+
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto_imaging.c22 May 2007 23:04:02 -  1.12
+++ ephoto_imaging.c23 May 2007 22:02:56 -  1.13
@@ -1,5 +1,8 @@
 #include ephoto.h
 
+static void rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v);
+static void hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b);
+
 static void close_dialog(Ewl_Widget *w, void *event, void *data);
 static void close_progress(Ewl_Widget *w, void *event, void *data);
 static void save_clicked(Ewl_Widget *w, void *event, void *data);
@@ -7,6 +10,110 @@
 
 static Ewl_Widget *save_win, *qseek;
 
+static void rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v)
+{
+   int delta, min, max;
+
+   max = (r + g + abs(r - g)) / 2;
+   max = (max + b + abs(max - b)) / 2;
+   min = (r + g - abs(r - g)) / 2;
+   min = (min + b - abs(min - b)) / 2;
+
+   delta = max - min;
+   *v = (float)(100 * max) / 255.0;
+
+   if (max != 0) *s = (float)(100 * delta) / (float)max;
+
+   else
+   {
+   *s = 0.0;
+   *h = 0.0;
+   *v = 0.0;
+   }
+
+   if (r == max) *h = (float)(100 * (g - b)) / (float)(6.0 * delta);
+
+   else
+   {
+   if (g == max) *h = (float)(100 * (2 * delta + b - r)) / 
(float)(6.0 * delta);
+   else *h = (float)(100 * (4 * delta + r - g)) / (float)(6.0 * 
delta);
+   }
+   if (*h  0.0) *h += 100.0;
+   if (*h  100.0) *h -= 100.0;
+
+   return;
+}
+
+static void hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b)
+{
+   float hh, f, p, q, t;
+   int i;
+
+   if (s == 0.0)
+   {
+   *r = (int)(((v * 255.0) / 100.0) + 0.5);
+   *g = (int)(((v * 255.0) / 100.0) + 0.5);
+   *b = (int)(((v * 255.0) / 100.0) + 0.5);
+   
+   return;
+   }
+   
+   hh = (h * 6.0) / 100.0;
+   i = floor(hh);
+   f = hh - (float)i;
+
+   p = v * (1.0 - s / 100.0) / 100.0;
+   q = v * (1.0 - (s *

E CVS: apps/ephoto titan

2007-05-22 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_edit_view.c ephoto_imaging.c 


Log Message:
Ephoto can now convert images to black and white. The filter is under 
the 
advanced tools in the edit view.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ephoto.h19 May 2007 16:59:09 -  1.21
+++ ephoto.h22 May 2007 23:04:02 -  1.22
@@ -85,6 +85,7 @@
 unsigned int *rotate_right(Ewl_Widget *image);
 unsigned int *blur_image(Ewl_Widget *image);
 unsigned int *sharpen_image(Ewl_Widget *image);
+unsigned int *grayscale_image(Ewl_Widget *image);
 void update_image(Ewl_Widget *image, int w, int h, unsigned int *data);
 void save_dialog(const char *file);
 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ephoto_edit_view.c  14 May 2007 21:54:05 -  1.21
+++ ephoto_edit_view.c  22 May 2007 23:04:02 -  1.22
@@ -14,6 +14,7 @@
 static void rotate_image_right(Ewl_Widget *w, void *event, void *data);
 static void image_blur(Ewl_Widget *w, void *event, void *data);
 static void image_sharpen(Ewl_Widget *w, void *event, void *data);
+static void image_grayscale(Ewl_Widget *w, void *event, void *data);
 
 /*Add the edit view*/
 Ewl_Widget *add_edit_view(Ewl_Widget *c)
@@ -139,6 +140,11 @@
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
+   button = add_button(c, Black and White, NULL, image_grayscale, NULL);
+   ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
+ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
+
return;
 }
 
@@ -313,3 +319,16 @@
 return;
 }
 
+/*Convert image to Black and White*/
+static void image_grayscale(Ewl_Widget *w, void *event, void *data)
+{
+   unsigned int *image_data;
+   int nw, nh;
+
+   evas_object_image_size_get(EWL_IMAGE(em-eimage)-image, nw, nh);
+   image_data = grayscale_image(em-eimage);
+   update_image(em-eimage, nw, nh, image_data);
+   ewl_widget_configure(em-eimage-parent);
+
+   return;
+}
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto_imaging.c18 May 2007 21:47:24 -  1.11
+++ ephoto_imaging.c22 May 2007 23:04:02 -  1.12
@@ -280,6 +280,30 @@
return im_data_new;
 }
 
+unsigned int *grayscale_image(Ewl_Widget *image)
+{
+unsigned int *im_data, *im_data_new;
+int gray, i, r, g, b, a, ew, eh;
+
+im_data = evas_object_image_data_get(EWL_IMAGE(image)-image, FALSE);
+evas_object_image_size_get(EWL_IMAGE(image)-image, ew, eh);
+
+im_data_new = malloc(sizeof(unsigned int) * ew * eh);
+
+for (i = 0; i  (ew * eh); i++)
+{
+   b = (int)((im_data[i])  0xff);
+   g = (int)((im_data[i]  8)  0xff);
+   r = (int)((im_data[i]  16)  0xff);
+   a = (int)((im_data[i]  24)  0xff);
+
+   gray = (int)((0.3 * r) + (0.59 * g) + (0.11 * b));
+   
+   im_data_new[i] = (gray  24) | (gray  16) | (gray  8) | 
gray;
+}
+return im_data_new;
+}
+
 void update_image(Ewl_Widget *image, int w, int h, unsigned int *data)
 {
if (w  h  !data)



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-19 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_gui.c ephoto_main.c 


Log Message:
Cleanup

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ephoto.h11 May 2007 22:49:31 -  1.20
+++ ephoto.h19 May 2007 16:59:09 -  1.21
@@ -66,17 +66,17 @@
 
 /* Ephoto Gui */
 Ewl_Widget *add_box(Ewl_Widget *c, Ewl_Orientation orientation, int spacing);
-Ewl_Widget *add_button(Ewl_Widget *c, const char *txt, const char *img, void 
*cb, void *data);
-Ewl_Widget *add_entry(Ewl_Widget *c, const char *txt, void *cb, void *data);
-Ewl_Widget *add_icon(Ewl_Widget *c, const char *lbl, const char *img, int 
thumbnail, void *cb, void *data);
+Ewl_Widget *add_button(Ewl_Widget *c, char *lbl, const char *img, void *cb, 
void *data);
+Ewl_Widget *add_entry(Ewl_Widget *c, char *txt, void *cb, void *data);
+Ewl_Widget *add_icon(Ewl_Widget *c, char *lbl, const char *img, int thumbnail, 
void *cb, void *data);
 Ewl_Widget *add_image(Ewl_Widget *c, const char *img, int thumbnail, void *cb, 
void *data);
-Ewl_Widget *add_label(Ewl_Widget *c, const char *lbl);
+Ewl_Widget *add_label(Ewl_Widget *c, char *lbl);
 Ewl_Widget *add_menubar(Ewl_Widget *c);
-Ewl_Widget *add_menu(Ewl_Widget *c, const char *lbl);
-Ewl_Widget *add_menu_item(Ewl_Widget *c, const char *lbl, const char *img, 
void *cb, void *data);
-Ewl_Widget *add_text(Ewl_Widget *c, const char *text);
+Ewl_Widget *add_menu(Ewl_Widget *c, char *lbl);
+Ewl_Widget *add_menu_item(Ewl_Widget *c, char *lbl, const char *img, void *cb, 
void *data);
+Ewl_Widget *add_text(Ewl_Widget *c, char *text);
 Ewl_Widget *add_shadow(Ewl_Widget *c);
-Ewl_Widget *add_window(const char *name, int width, int height, void *cb, void 
*data);
+Ewl_Widget *add_window(char *name, int width, int height, void *cb, void 
*data);
 
 /* Ephoto Imaging */
 unsigned int *flip_horizontal(Ewl_Widget *image);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ephoto_gui.c15 May 2007 17:09:26 -  1.10
+++ ephoto_gui.c19 May 2007 16:59:09 -  1.11
@@ -15,13 +15,13 @@
 }
 
 /*Create and Add a Button to the Container c*/
-Ewl_Widget *add_button(Ewl_Widget *c, const char *txt, const char *img, void 
*cb, void *data)
+Ewl_Widget *add_button(Ewl_Widget *c, char *lbl, const char *img, void *cb, 
void *data)
 {
Ewl_Widget *button;
 
button = ewl_button_new();
if(img) ewl_button_image_set(EWL_BUTTON(button), img, NULL);
-   if(txt) ewl_button_label_set(EWL_BUTTON(button), _(txt));
+   if(lbl) ewl_button_label_set(EWL_BUTTON(button), _(lbl));
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
if(c) ewl_container_child_append(EWL_CONTAINER(c), button);
@@ -32,7 +32,7 @@
 }
 
 /*Create and Add an Entry to Container c With Text txt and the Callback cb*/
-Ewl_Widget *add_entry(Ewl_Widget *c, const char *txt, void *cb, void *data)
+Ewl_Widget *add_entry(Ewl_Widget *c, char *txt, void *cb, void *data)
 {
Ewl_Widget *entry;
 
@@ -46,7 +46,7 @@
 }
 
 /*Create and add an icon to the container c*/
-Ewl_Widget *add_icon(Ewl_Widget *c, const char *lbl, const char *img, int 
thumbnail, void *cb, void *data)
+Ewl_Widget *add_icon(Ewl_Widget *c, char *lbl, const char *img, int thumbnail, 
void *cb, void *data)
 {
Ewl_Widget *icon;

@@ -99,7 +99,7 @@
 }
 
 /*Create and Add a Label to the Container c, With the Text lbl*/
-Ewl_Widget *add_label(Ewl_Widget *c, const char *lbl)
+Ewl_Widget *add_label(Ewl_Widget *c, char *lbl)
 {
Ewl_Widget *label;
 
@@ -127,7 +127,7 @@
 }
 
 /*Create and Add a Menu to the Container c*/
-Ewl_Widget *add_menu(Ewl_Widget *c, const char *lbl)
+Ewl_Widget *add_menu(Ewl_Widget *c, char *lbl)
 {
Ewl_Widget *menu;

@@ -141,7 +141,7 @@
 }
 
 /*Create and Add a Menu Item to the Container c*/
-Ewl_Widget *add_menu_item(Ewl_Widget *c, const char *lbl, const char *img, 
void *cb, void *data)
+Ewl_Widget *add_menu_item(Ewl_Widget *c, char *lbl, const char *img, void *cb, 
void *data)
 {
Ewl_Widget *mi;
 
@@ -170,7 +170,7 @@
 }
 
 /*Create and Add a Text Widget to the Container c*/
-Ewl_Widget *add_text(Ewl_Widget *c, const char *txt)
+Ewl_Widget *add_text(Ewl_Widget *c, char *txt)
 {
Ewl_Widget *text;

@@ -185,7 +185,7 @@
 }
 
 /*Create and Add a Window*/
-Ewl_Widget *add_window(const char *name, int width, int height, void *cb, void 
*data)
+Ewl_Widget *add_window(char *name, int width, int height, void *cb, void *data)
 {
Ewl_Widget *win;

E CVS: apps/ephoto titan

2007-05-19 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.c 


Log Message:
Patch from Marcus Huwe to fix ephoto warnings with scanf.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ephoto.c19 Apr 2007 03:17:11 -  1.5
+++ ephoto.c20 May 2007 03:44:11 -  1.6
@@ -71,7 +71,12 @@
printf(Are you sure you want to create an album with 
   the name %s and the description %s? , 
   name, description);
-   scanf(%c, input);
+   int ret = scanf(%c, input);
+   if(!ret || ret == EOF)
+   {
+   printf(read error\n);
+   return 1;
+   }
if(input == 'y' || input == 'Y')
{
db = ephoto_db_init();
@@ -112,7 +117,12 @@
printf(Are you sure you want to add an image 
   to album %s with a name %s and path %s? , 
   album, name, path);
-   scanf(%c, input);
+   int ret = scanf(%c, input);
+   if(!ret || ret == EOF)
+   {
+   printf(read error\n);
+   return 1;
+   }
if(input == 'y' || input == 'Y')
{
db = ephoto_db_init();
@@ -145,7 +155,12 @@
 printf(Are you sure you want to add images 
from the directory %s to the album %s? ,
path, album);
-scanf(%c, input);
+int ret = scanf(%c, input);
+   if(!ret || ret 
== EOF)
+   {
+   
printf(read error\n);
+   
return 1;
+   }
 if(input == 'y' || input == 'Y')
 {
db = ephoto_db_init();
@@ -211,7 +226,12 @@
 
printf(Are you sure you want to remove the album %s? 
, 
   name);
-   scanf(%c, input);
+   int ret = scanf(%c, input);
+   if(!ret || ret == EOF)
+   {
+   printf(read error\n);
+   return 1;
+   }
if(input == 'y' || input == 'Y')
{
db = ephoto_db_init();
@@ -245,7 +265,12 @@
printf(Are you sure you want to remove the image %s 
   from the album %s? , 
   path, album);
-   scanf(%c, input);
+   int ret = scanf(%c, input);
+   if(!ret || ret == EOF)
+   {
+   printf(read error\n);
+   return 1;
+   }
if(input == 'y' || input == 'Y')
{
db = ephoto_db_init();



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-18 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_imaging.c 


Log Message:
Convert the save dialog to use one slider.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ephoto_imaging.c15 May 2007 17:09:26 -  1.8
+++ ephoto_imaging.c18 May 2007 21:16:41 -  1.9
@@ -1,6 +1,8 @@
 #include ephoto.h
 
 static void close_dialog(Ewl_Widget *w, void *event, void *data);
+static void close_progress(Ewl_Widget *w, void *event, void *data);
+static void save_clicked(Ewl_Widget *w, void *event, void *data);
 static void save_image(Ewl_Widget *w, void *event, void *data);
 
 static Ewl_Widget *save_win, *qseek;
@@ -299,35 +301,79 @@
ewl_widget_destroy(save_win);
 }
 
+static void close_progress(Ewl_Widget *w, void *event, void *data)
+{
+   ewl_widget_destroy(w);
+}
+
 static void save_image(Ewl_Widget *w, void *event, void *data)
 {
const char *file;
-   char *ext;
char flags[PATH_MAX];
-   pid_t pid;
+   char *ext;
+
+   file = data;
 
-   file = ewl_text_text_get(EWL_TEXT(data)); 
-   
ext = strrchr(file, '.')+1;
-   printf(%s\n, ext);
-   snprintf(flags, PATH_MAX, quality=%i, 
-   (int)ewl_range_value_get(EWL_RANGE(qseek))*10);
+   if (!strncmp(ext, png, 3))
+   {
+   snprintf(flags, PATH_MAX, compress=%i,
+  (int)ewl_range_value_get(EWL_RANGE(qseek)));
+   }
+   if (!strncmp(ext, jpg, 3) || !strncmp(ext, jpeg, 4))
+   {
+   double svalue;
+   float jvalue;
 
-   if(!file) return;
+   svalue = ewl_range_value_get(EWL_RANGE(qseek));
+   jvalue = (svalue / 9) * 100;
 
-   if(VISIBLE(em-eimage))
-   {
-   pid = fork();
-   if(pid == 0)
-   {
-   evas_object_image_save(EWL_IMAGE(em-eimage)-image, 
-   file, NULL, flags);
-   exit(0);
-   }
+   if (jvalue  10)
+   snprintf(flags, PATH_MAX, quality=%1.0f, jvalue);
+
+   if (jvalue = 10  jvalue  100)
+   snprintf(flags, PATH_MAX, quality=%2.0f, jvalue);
+
+   if (jvalue == 100)
+   snprintf(flags, PATH_MAX, quality=%3.0f, jvalue);
}
+   printf(%s\n, flags);
+   if(!file) return;
+
+if(VISIBLE(em-eimage))
+{
+   evas_object_image_save(EWL_IMAGE(em-eimage)-image,
+file, NULL, flags);
+}
+   
+   ewl_widget_destroy(EWL_WIDGET(w));
+}
+
+static void save_clicked(Ewl_Widget *w, void *event, void *data)
+{
+   char *file;
+
+   Ewl_Widget *pwin, *vbox, *label, *pbar;
+
+   file = ewl_text_text_get(EWL_TEXT(data)); 
+   
+   if(!file) return;
 
ewl_widget_destroy(save_win);
 
+   pwin = add_window(Save Progress, 200, 75, close_progress, NULL);
+   ewl_callback_append(pwin, EWL_CALLBACK_SHOW, save_image, file);
+
+   vbox = add_box(pwin, EWL_ORIENTATION_VERTICAL, 5);
+
+   label = add_label(vbox, Save Progress);
+
+   pbar = ewl_progressbar_new();
+   ewl_progressbar_label_set(EWL_PROGRESSBAR(pbar), Saving...);
+   ewl_range_unknown_set(EWL_RANGE(pbar), 1);
+   ewl_container_child_append(EWL_CONTAINER(vbox), pbar);
+   ewl_widget_show(pbar);
+
return;
 }
 
@@ -347,10 +393,10 @@
add_label(vbox, Quality/Compression:);
 
qseek = ewl_hseeker_new();
-   ewl_range_minimum_value_set(EWL_RANGE(qseek), 0);
-   ewl_range_maximum_value_set(EWL_RANGE(qseek), 100);
-   ewl_range_step_set(EWL_RANGE(qseek), 10);
-   ewl_range_value_set(EWL_RANGE(qseek), 80);
+   ewl_range_minimum_value_set(EWL_RANGE(qseek), 1);
+   ewl_range_maximum_value_set(EWL_RANGE(qseek), 9);
+   ewl_range_step_set(EWL_RANGE(qseek), 1);
+   ewl_range_value_set(EWL_RANGE(qseek), 7);
ewl_container_child_append(EWL_CONTAINER(vbox), qseek);
ewl_widget_show(qseek);
 
@@ -360,7 +406,7 @@
 
button = add_button(hbox, Save, 
PACKAGE_DATA_DIR /images/stock_save.png, 
-   save_image, entry);
+   save_clicked, entry);
ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);  
 
button = add_button(hbox, Close, 



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No

E CVS: apps/ephoto titan

2007-05-18 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_imaging.c 


Log Message:
That was a stupid way to do it. Silly ifs.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ephoto_imaging.c18 May 2007 21:16:41 -  1.9
+++ ephoto_imaging.c18 May 2007 21:46:00 -  1.10
@@ -328,14 +328,7 @@
svalue = ewl_range_value_get(EWL_RANGE(qseek));
jvalue = (svalue / 9) * 100;
 
-   if (jvalue  10)
-   snprintf(flags, PATH_MAX, quality=%1.0f, jvalue);
-
-   if (jvalue = 10  jvalue  100)
-   snprintf(flags, PATH_MAX, quality=%2.0f, jvalue);
-
-   if (jvalue == 100)
-   snprintf(flags, PATH_MAX, quality=%3.0f, jvalue);
+   snprintf(flags, PATH_MAX, quality=%.0f, jvalue);
}
printf(%s\n, flags);
if(!file) return;



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-18 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_imaging.c 


Log Message:
Remove printf.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ephoto_imaging.c18 May 2007 21:46:00 -  1.10
+++ ephoto_imaging.c18 May 2007 21:47:24 -  1.11
@@ -330,7 +330,7 @@
 
snprintf(flags, PATH_MAX, quality=%.0f, jvalue);
}
-   printf(%s\n, flags);
+
if(!file) return;
 
 if(VISIBLE(em-eimage))



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_imaging.c ephoto_main.c ephoto_slideshow.c 


Log Message:
Cleanups. Fix slideshow segv.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ephoto_imaging.c14 May 2007 17:05:29 -  1.6
+++ ephoto_imaging.c15 May 2007 16:44:07 -  1.7
@@ -3,7 +3,7 @@
 static void close_dialog(Ewl_Widget *w, void *event, void *data);
 static void save_image(Ewl_Widget *w, void *event, void *data);
 
-static Ewl_Widget *save_win, *qseek, *cseek;
+static Ewl_Widget *save_win, *qseek;
 
 unsigned int *flip_horizontal(Ewl_Widget *image)
 {
@@ -305,8 +305,7 @@
pid_t pid;
 
file = ewl_text_text_get(EWL_TEXT(data)); 
-   snprintf(flags, PATH_MAX, quality=%i compress=%i, 
(int)ewl_range_value_get(EWL_RANGE(qseek)), 
-  
(int)ewl_range_value_get(EWL_RANGE(cseek)));
+   snprintf(flags, PATH_MAX, quality=%i, 
(int)ewl_range_value_get(EWL_RANGE(qseek)));
 
if(!file) return;
 
@@ -338,7 +337,7 @@
 
entry = add_entry(vbox, default.jpg, NULL, NULL);
 
-   add_label(vbox, Quality:);
+   add_label(vbox, Quality/Compression:);
 
qseek = ewl_hseeker_new();
ewl_range_minimum_value_set(EWL_RANGE(qseek), 0);
@@ -348,16 +347,6 @@
ewl_container_child_append(EWL_CONTAINER(vbox), qseek);
ewl_widget_show(qseek);
 
-   add_label(vbox, Compression:);
-
-   cseek = ewl_hseeker_new();
-   ewl_range_minimum_value_set(EWL_RANGE(cseek), 0);
-   ewl_range_maximum_value_set(EWL_RANGE(cseek), 9);
-   ewl_range_step_set(EWL_RANGE(cseek), 1);
-   ewl_range_value_set(EWL_RANGE(cseek), 9);
-   ewl_container_child_append(EWL_CONTAINER(vbox), cseek);
-   ewl_widget_show(cseek); 
-   
hbox = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 5);
ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ephoto_main.c   14 May 2007 17:05:29 -  1.32
+++ ephoto_main.c   15 May 2007 16:44:07 -  1.33
@@ -324,6 +324,7 @@
em-images = ephoto_db_list_images(em-db, em-current_album);
 
ecore_dlist_goto_first(em-images);
+   
ewl_container_reset(EWL_CONTAINER(em-fbox));
 while (ecore_dlist_current(em-images))
 {
@@ -337,7 +338,7 @@
}
ecore_dlist_next(em-images);
 }
-   ewl_widget_reparent(em-fbox);
+   ewl_widget_configure(em-fbox);
ecore_dlist_goto_first(em-images);
if(ecore_dlist_current(em-images)) 
{
@@ -398,7 +399,7 @@
}
ecore_dlist_next(em-images);
}
-   ewl_widget_reparent(em-fbox);
+   ewl_widget_configure(em-fbox);
ecore_dlist_goto_first(em-images);
if(ecore_dlist_current(em-images))
{ 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_slideshow.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ephoto_slideshow.c  30 Mar 2007 02:47:16 -  1.4
+++ ephoto_slideshow.c  15 May 2007 16:44:07 -  1.5
@@ -31,6 +31,7 @@
 static void destroy(Ewl_Widget *w, void *event, void *data)
 {
ewl_widget_destroy(win);
+   ecore_timer_del(change);
 }
 
 static void show_first_image(Ewl_Widget *w, void *event, void *data)



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_database.c ephoto_exif.c ephoto_gui.c ephoto_imaging.c 
ephoto_main.c ephoto_single_view.c ephoto_utils.c 


Log Message:
Formatting++

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_database.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ephoto_database.c   11 Mar 2007 09:19:53 -  1.7
+++ ephoto_database.c   15 May 2007 17:09:26 -  1.8
@@ -45,7 +45,8 @@
sqlite3_exec(db, CREATE TABLE album_images( 
 image_id INTEGER NOT NULL, 
 album_id INTEGER NOT NULL);, 0, 0, 0);
-   ephoto_db_add_album(db, Complete Library, Contains every 
tagged image!);
+   ephoto_db_add_album(db, Complete Library, 
+   Contains every tagged image!);
}
else 
{
@@ -85,8 +86,9 @@
 {
char command[PATH_MAX];
 
-   snprintf(command, PATH_MAX, INSERT or IGNORE INTO albums(name, 
description) 
-VALUES('%s', '%s');, name, description);
+   snprintf(command, PATH_MAX, 
+ INSERT or IGNORE INTO albums(name, description) 
+  VALUES('%s', '%s');, name, description);
sqlite3_exec(db, command, 0, 0, 0);
 
return;
@@ -97,11 +99,15 @@
 {
char command[PATH_MAX];
 
-   snprintf(command, PATH_MAX, DELETE FROM albums WHERE name = '%s';, 
name);
+   snprintf(command, PATH_MAX, DELETE FROM albums WHERE name = '%s';, 
+   name);
sqlite3_exec(db, command, 0, 0, 0);
-   snprintf(command, PATH_MAX, SELECT id FROM albums WHERE name = '%s';, 
name);
+   snprintf(command, PATH_MAX, SELECT id FROM albums WHERE name = '%s';,
+   name);
sqlite3_exec(db, command, get_album_id, 0, 0);
-   snprintf(command, PATH_MAX, DELETE FROM album_images WHERE album_id = 
'%d';, album_id);
+   snprintf(command, PATH_MAX, 
+   DELETE FROM album_images WHERE album_id = '%d';, 
+   album_id);
sqlite3_exec(db, command, 0, 0, 0);
 
return;
@@ -115,19 +121,24 @@
snprintf(command, PATH_MAX, INSERT or IGNORE INTO images(name, path) 
VALUES('%s', '%s');, name, path);
sqlite3_exec(db, command, 0, 0, 0);
-   snprintf(command, PATH_MAX, SELECT id FROM images WHERE path = '%s';, 
path);
+   snprintf(command, PATH_MAX, SELECT id FROM images WHERE path = '%s';,
+path);
sqlite3_exec(db, command, get_image_id, 0, 0);
-   snprintf(command, PATH_MAX, SELECT id FROM albums WHERE name = '%s';, 
album);
+   snprintf(command, PATH_MAX, SELECT id FROM albums WHERE name = '%s';, 
+   album);
sqlite3_exec(db, command, get_album_id, 0, 0);
-   snprintf(command, PATH_MAX, INSERT or IGNORE into 
album_images(image_id, album_id) 
-   VALUES('%d', '%d');, image_id, album_id);
+   snprintf(command, PATH_MAX, 
+   INSERT or IGNORE into album_images(image_id, album_id) 
+   VALUES('%d', '%d');, image_id, album_id);
sqlite3_exec(db, command, 0, 0, 0);
 
/*This is to make sure the complete library has all images*/
-   snprintf(command, PATH_MAX, SELECT id FROM albums WHERE name = 
'Complete Library';);
+   snprintf(command, PATH_MAX, 
+   SELECT id FROM albums WHERE name = 'Complete Library';);
sqlite3_exec(db, command, get_album_id, 0, 0);
-   snprintf(command, PATH_MAX, INSERT into album_images(image_id, 
album_id) 
-   VALUES('%d', '%d');, image_id, album_id);
+   snprintf(command, PATH_MAX, 
+ INSERT into album_images(image_id, album_id) 
+ VALUES('%d', '%d');, image_id, album_id);
sqlite3_exec(db, command, 0, 0, 0);
 
return;
@@ -138,12 +149,15 @@
 {
char command[PATH_MAX];
 
-   snprintf(command, PATH_MAX, SELECT id FROM albums WHERE name = '%s';, 
album);
+   snprintf(command, PATH_MAX, SELECT id FROM albums WHERE name = '%s';, 
+   album);
sqlite3_exec(db, command, get_album_id, 0, 0);
-   snprintf(command, PATH_MAX, SELECT id FROM images WHERE path = '%s';, 
path);
+   snprintf(command, PATH_MAX, SELECT id FROM images WHERE path = '%s';, 
+

E CVS: apps/ephoto titan

2007-05-14 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_edit_view.c ephoto_exif.c ephoto_gui.c ephoto_imaging.c 
ephoto_list_view.c ephoto_main.c ephoto_single_view.c 


Log Message:
Clean it up for translators.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ephoto_edit_view.c  11 May 2007 22:49:31 -  1.19
+++ ephoto_edit_view.c  14 May 2007 17:05:29 -  1.20
@@ -5,6 +5,9 @@
 static void add_advanced_edit_tools(Ewl_Widget *c);
 static void previous_image(Ewl_Widget *w, void *event, void *data);
 static void next_image(Ewl_Widget *w, void *event, void *data);
+static void zoom_in(Ewl_Widget *w, void *event, void *data);
+static void zoom_out(Ewl_Widget *w, void *event, void *data);
+//static void zoom_full(Ewl_Widget *w, void *event, void *data);
 static void flip_image_horizontal(Ewl_Widget *w, void *event, void *data);
 static void flip_image_vertical(Ewl_Widget *w, void *event, void *data);
 static void rotate_image_left(Ewl_Widget *w, void *event, void *data);
@@ -30,7 +33,7 @@
ewl_object_maximum_w_set(EWL_OBJECT(standard), 172);
ewl_object_minimum_w_set(EWL_OBJECT(standard), 172);
ewl_object_fill_policy_set(EWL_OBJECT(standard), EWL_FLAG_FILL_VFILL);
-   ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), standard, Standard 
Tools);   
+   ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), standard, _(Standard 
Tools));
 
add_standard_edit_tools(standard);
 
@@ -38,7 +41,7 @@
 ewl_object_maximum_w_set(EWL_OBJECT(advanced), 172);
 ewl_object_minimum_w_set(EWL_OBJECT(advanced), 172);
 ewl_object_fill_policy_set(EWL_OBJECT(advanced), EWL_FLAG_FILL_VFILL);
-ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), advanced, Advanced 
Tools);
+ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), advanced, _(Advanced 
Tools));
 
add_advanced_edit_tools(advanced);
 
@@ -60,11 +63,11 @@
 
 button = add_button(bhbox, NULL, PACKAGE_DATA_DIR 
/images/media-seek-backward.png, previous_image, NULL);
 ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);
-ewl_attach_tooltip_text_set(button, Previous Image);
+ewl_attach_tooltip_text_set(button, _(Previous Image));
 
 button = add_button(bhbox, NULL, PACKAGE_DATA_DIR 
/images/media-seek-forward.png, next_image, NULL);
 ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);
-ewl_attach_tooltip_text_set(button, Next Image);
+ewl_attach_tooltip_text_set(button, _(Next Image));
 
return hbox;
 }
@@ -83,6 +86,21 @@
 {
Ewl_Widget *button;
 
+   button = add_button(c, Zoom In, PACKAGE_DATA_DIR 
/images/search.png, zoom_in, NULL);
+ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
+ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
+
+   button = add_button(c, Zoom Out, PACKAGE_DATA_DIR 
/images/search.png, zoom_out, NULL);
+ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
+ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
+
+   //button = add_button(c, Zoom 1:1, PACKAGE_DATA_DIR 
/images/search.png, zoom_full, NULL);
+ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
+ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
+ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
+
button = add_button(c, Rotate Left, PACKAGE_DATA_DIR 
/images/undo.png, rotate_image_left, NULL);
ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
@@ -142,7 +160,6 @@
 return;
 }
 
-
 /*Go to the next image*/
 static void next_image(Ewl_Widget *w, void *event, void *data)
 {
@@ -160,6 +177,33 @@

return;
 }
+
+/*Zoom in on the image*/
+static void zoom_in(Ewl_Widget *w, void *event, void *data)
+{
+   int ow, oh;
+   
+   ewl_object_current_size_get(EWL_OBJECT(em-eimage), ow, oh);
+
+   ewl_image_size_set(EWL_IMAGE(em-eimage), ow*2, oh*2);
+   ewl_widget_configure(em-eimage-parent);
+
+   return;
+}
+
+/*Zoom out the image*/
+static void zoom_out(Ewl_Widget *w, void *event, void *data)
+{
+int ow, oh;
+
+ewl_object_current_size_get(EWL_OBJECT(em-eimage), ow, oh);
+
+ewl_image_size_set(EWL_IMAGE(em-eimage), ow/2, oh/2);
+ewl_widget_configure(em-eimage-parent);
+
+return;
+}
+
 
 /*Flip the image 180 degrees horizontally*/
 static void flip_image_horizontal(Ewl_Widget *w, void *event, void *data)

E CVS: apps/ephoto titan

2007-05-14 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_edit_view.c 


Log Message:
Fix the error images for blur and sharpen buttons.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ephoto_edit_view.c  14 May 2007 17:05:29 -  1.20
+++ ephoto_edit_view.c  14 May 2007 21:54:05 -  1.21
@@ -129,12 +129,12 @@
 {
Ewl_Widget *button;
 
-   button = add_button(c, Blur Image, PACKAGE_DATA_DIR , image_blur, 
NULL);
+   button = add_button(c, Blur Image, NULL, image_blur, NULL);
ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
 
-   button = add_button(c, Sharpen Image, PACKAGE_DATA_DIR , 
image_sharpen, NULL);
+   button = add_button(c, Sharpen Image, NULL, image_sharpen, NULL);
 ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
 ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
 ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-05-06 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_edit_view.c ephoto_imaging.c ephoto_main.c 


Log Message:
Add saving images. This works now, but not extensively. *WARNING* Does not 
carry over exif yet.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ephoto.h28 Apr 2007 04:12:24 -  1.18
+++ ephoto.h7 May 2007 02:12:27 -   1.19
@@ -84,7 +84,7 @@
 unsigned int *rotate_left(Ewl_Widget *image);
 unsigned int *rotate_right(Ewl_Widget *image);
 void update_image(Ewl_Widget *image, int w, int h, unsigned int *data);
-void save_image(Ewl_Widget *image, const char *file);
+void save_dialog(const char *file);
 
 /* Ephoto Edit View */
 Ewl_Widget *add_edit_view(Ewl_Widget *c);
@@ -141,6 +141,7 @@
Ewl_Widget *simage;
Ewl_Widget *single_sp;
Ewl_Widget *single_vbox;
+   Ewl_Widget *smi;
Ewl_Widget *toolbar;
Ewl_Widget *view;
Ewl_Widget *view_box;
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ephoto_edit_view.c  28 Apr 2007 04:12:24 -  1.17
+++ ephoto_edit_view.c  7 May 2007 02:12:27 -   1.18
@@ -69,6 +69,7 @@
 {
 ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-main_nb), 
em-edit_vbox);
ewl_image_file_path_set(EWL_IMAGE(em-eimage), 
ecore_dlist_current(em-images));
+   ewl_widget_enable(em-smi);
return;
 }
 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ephoto_imaging.c28 Apr 2007 04:12:24 -  1.2
+++ ephoto_imaging.c7 May 2007 02:12:27 -   1.3
@@ -1,5 +1,10 @@
 #include ephoto.h
 
+static void close_dialog(Ewl_Widget *w, void *event, void *data);
+static void save_image(Ewl_Widget *w, void *event, void *data);
+
+static Ewl_Widget *save_win, *qseek, *cseek;
+
 unsigned int *flip_horizontal(Ewl_Widget *image)
 {
unsigned int *im_data, *im_data_new;
@@ -137,18 +142,81 @@
}
 }
 
-void save_image(Ewl_Widget *image, const char *file)
+static void close_dialog(Ewl_Widget *w, void *event, void *data)
+{
+   ewl_widget_destroy(save_win);
+}
+
+static void save_image(Ewl_Widget *w, void *event, void *data)
 {
+   const char *file;
+   char flags[PATH_MAX];
pid_t pid;
 
-   if(image  file)
+   file = ewl_text_text_get(EWL_TEXT(data)); 
+   snprintf(flags, PATH_MAX, quality=%f compression=%f, 
ewl_range_value_get(EWL_RANGE(qseek)), 
+  
ewl_range_value_get(EWL_RANGE(cseek)));
+
+   if(!file) return;
+
+   if(VISIBLE(em-eimage)  file)
{
pid = fork();
if(pid == 0)
{
-   evas_object_image_save(EWL_IMAGE(image)-image, file, 
NULL, NULL);
+   evas_object_image_save(EWL_IMAGE(em-eimage)-image, 
file, NULL, flags);
exit(0);
}
}
+
+   ewl_widget_destroy(save_win);
+
+   return;
+}
+
+void save_dialog(const char *file)
+{
+Ewl_Widget *vbox, *hbox, *button, *entry;
+
+   save_win = add_window(Save Image, 300, 100, close_dialog, NULL);
+
+   vbox = add_box(save_win, EWL_ORIENTATION_VERTICAL, 5);
+   ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
+
+   add_label(vbox, Save As:);
+
+   entry = add_entry(vbox, default.jpg, NULL, NULL);
+
+   add_label(vbox, Quality:);
+
+   qseek = ewl_hseeker_new();
+   ewl_range_minimum_value_set(EWL_RANGE(qseek), 0);
+   ewl_range_maximum_value_set(EWL_RANGE(qseek), 100);
+   ewl_range_step_set(EWL_RANGE(qseek), 10);
+   ewl_range_value_set(EWL_RANGE(qseek), 80);
+   ewl_container_child_append(EWL_CONTAINER(vbox), qseek);
+   ewl_widget_show(qseek);
+
+   add_label(vbox, Compression:);
+
+   cseek = ewl_hseeker_new();
+   ewl_range_minimum_value_set(EWL_RANGE(cseek), 0);
+   ewl_range_maximum_value_set(EWL_RANGE(cseek), 9);
+   ewl_range_step_set(EWL_RANGE(cseek), 1);
+   ewl_range_value_set(EWL_RANGE(cseek), 9);
+   ewl_container_child_append(EWL_CONTAINER(vbox), cseek);
+   ewl_widget_show(cseek); 
+   
+   hbox = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 5);
+   ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
+   ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK);
+
+   button = add_button(hbox, Save, PACKAGE_DATA_DIR 
/images/stock_save.png,

E CVS: apps/ephoto titan

2007-05-06 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_imaging.c 


Log Message:
Fix a flag typo for saving

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto_imaging.c7 May 2007 02:12:27 -   1.3
+++ ephoto_imaging.c7 May 2007 02:17:05 -   1.4
@@ -154,12 +154,12 @@
pid_t pid;
 
file = ewl_text_text_get(EWL_TEXT(data)); 
-   snprintf(flags, PATH_MAX, quality=%f compression=%f, 
ewl_range_value_get(EWL_RANGE(qseek)), 
+   snprintf(flags, PATH_MAX, quality=%f compress=%f, 
ewl_range_value_get(EWL_RANGE(qseek)), 
   
ewl_range_value_get(EWL_RANGE(cseek)));
 
if(!file) return;
 
-   if(VISIBLE(em-eimage)  file)
+   if(VISIBLE(em-eimage))
{
pid = fork();
if(pid == 0)



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-04-28 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_exif.c ephoto_main.c 


Log Message:
Fix some of the dialogs.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_exif.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ephoto_exif.c   28 Apr 2007 04:12:24 -  1.15
+++ ephoto_exif.c   28 Apr 2007 18:24:45 -  1.16
@@ -124,7 +124,7 @@
 void display_exif_dialog(Ewl_Widget *w, void *event, void *data)
 {
const char *img;
-   Ewl_Widget *win = NULL, *vbox, *image, *sp, *list, *text;
+   Ewl_Widget *win, *vbox, *image, *sp, *list, *text;
Ewl_Model *model;
Ewl_View *view;

@@ -134,7 +134,8 @@
return;
}
 
-   win = add_window(Ephoto Exif Info, 310, 460, close_dialog, win);
+   win = add_window(Ephoto Exif Info, 310, 460, NULL, NULL);
+   ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, close_dialog, win);
ewl_window_dialog_set(EWL_WINDOW(win), 1);
 
vbox = add_box(win, EWL_ORIENTATION_VERTICAL, 5);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ephoto_main.c   28 Apr 2007 04:12:24 -  1.29
+++ ephoto_main.c   28 Apr 2007 18:24:45 -  1.30
@@ -124,8 +124,8 @@
 {
Ewl_Widget *window, *label, *button, *vbox, *hbox;

-   window = NULL;
-   window = add_window(Add Album, 200, 100, cancel, window);
+   window = add_window(Add Album, 200, 100, NULL, NULL);
+   ewl_callback_append(window, EWL_CALLBACK_DELETE_WINDOW, cancel, window);
 
vbox = add_box(window, EWL_ORIENTATION_VERTICAL, 3);
ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
@@ -140,7 +140,9 @@
ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK);
 
button = add_button(hbox, Save, PACKAGE_DATA_DIR 
/images/stock_save.png, save, window);
+   ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);
button = add_button(hbox, Cancel, PACKAGE_DATA_DIR 
/images/dialog-close.png, cancel, window);
+   ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);
 }
 
 /*Create the Main Ephoto Window*/



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-04-27 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto


Modified Files:
TODO 


Log Message:
Update ephoto's TODO. If any other ideas crop up, feel free to add them to the 
TODO.

===
RCS file: /cvs/e/e17/apps/ephoto/TODO,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- TODO15 Feb 2007 10:20:18 -  1.1
+++ TODO27 Apr 2007 06:09:02 -  1.2
@@ -7,18 +7,21 @@
 
 
 TODO-
+===Command Line===
+Get some command line options going!
 ===General===
 Dialogs For Adding/Removing Albums/Images.
 DRAG AND DROP IS A MUST!
+===Layout===
+Ideas and Changes are welcome!
 ===Normal View===
-Multiple Selection.
 Seeker to Resize Thumbnails.
 ===Edit View===
-Add Editing Controls(Rotate/Zoom/Blur/Sharpen/Color/Histogram/etc..).
-===List View===
-Multiple Selection.
+Add Editing Controls(Zooms/Blurs/Sharpens/Color 
Enhancement/Histogram/Cropping/etc..).
+Add Saving Ability(This will include looking into editing and saving exif 
data).
+Should we list navigation for other images better?(than using buttons with 
arrows)
+===Single View===
+Should we list navigation for other images better?(than using buttons with 
arrwos)
 ===Slideshow===
-Need to Add Slideshow Code.
-===Theme===
-Need to Theme Text to Have a Blue State like Label Does.
-Need a Better Seeker Theme.
+Need to Add Configuration to Slideshows..
+Should Slideshow Backgrounds be black?



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-04-27 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_edit_view.c ephoto_exif.c ephoto_imaging.c 
ephoto_main.c ephoto_single_view.c 


Log Message:
Cleanups, move exif button out of edit view and into toolbar, start album work.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ephoto.h27 Apr 2007 05:55:37 -  1.17
+++ ephoto.h28 Apr 2007 04:12:24 -  1.18
@@ -84,6 +84,7 @@
 unsigned int *rotate_left(Ewl_Widget *image);
 unsigned int *rotate_right(Ewl_Widget *image);
 void update_image(Ewl_Widget *image, int w, int h, unsigned int *data);
+void save_image(Ewl_Widget *image, const char *file);
 
 /* Ephoto Edit View */
 Ewl_Widget *add_edit_view(Ewl_Widget *c);
@@ -138,6 +139,7 @@
Ewl_Widget *main_nb;
Ewl_Widget *main_vbox;
Ewl_Widget *simage;
+   Ewl_Widget *single_sp;
Ewl_Widget *single_vbox;
Ewl_Widget *toolbar;
Ewl_Widget *view;
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ephoto_edit_view.c  27 Apr 2007 04:37:40 -  1.16
+++ ephoto_edit_view.c  28 Apr 2007 04:12:24 -  1.17
@@ -77,16 +77,6 @@
 {
Ewl_Widget *button;
 
-button = add_button(c, Get Exif, PACKAGE_DATA_DIR 
/images/get_exif.png, NULL, NULL);
-ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
-   ewl_button_label_set(EWL_BUTTON(button), You do not have libexif 
0.6.13);
-   ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
-   ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_HFILL);
-#ifdef BUILD_EXIF_SUPPORT
-ewl_callback_append(button, EWL_CALLBACK_CLICKED, display_exif_dialog, 
NULL);
-ewl_button_label_set(EWL_BUTTON(button), View Exif Data);
-#endif
-
button = add_button(c, Rotate Left, PACKAGE_DATA_DIR 
/images/undo.png, rotate_image_left, NULL);
ewl_button_image_size_set(EWL_BUTTON(button), 30, 30);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_LEFT);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_exif.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ephoto_exif.c   30 Mar 2007 00:45:12 -  1.14
+++ ephoto_exif.c   28 Apr 2007 04:12:24 -  1.15
@@ -59,7 +59,7 @@
 {
const char *img = NULL;
 
-if (VISIBLE(em-edit_vbox)) img = 
ewl_image_file_path_get(EWL_IMAGE(em-eimage));
+img = ecore_dlist_current(em-images);
if(!img) return NULL;
return strdup(img);
 }
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto_imaging.c15 Feb 2007 10:20:21 -  1.1
+++ ephoto_imaging.c28 Apr 2007 04:12:24 -  1.2
@@ -136,3 +136,19 @@
evas_object_image_data_update_add(EWL_IMAGE(image)-image, 0, 
0, w, h);
}
 }
+
+void save_image(Ewl_Widget *image, const char *file)
+{
+   pid_t pid;
+
+   if(image  file)
+   {
+   pid = fork();
+   if(pid == 0)
+   {
+   evas_object_image_save(EWL_IMAGE(image)-image, file, 
NULL, NULL);
+   exit(0);
+   }
+   }
+   return;
+}
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ephoto_main.c   27 Apr 2007 05:55:37 -  1.28
+++ ephoto_main.c   28 Apr 2007 04:12:24 -  1.29
@@ -1,9 +1,12 @@
 #include ephoto.h
 
 /*Ewl Callbacks*/
+static void add_album(Ewl_Widget *w, void *event, void *data);
+static void cancel(Ewl_Widget *w, void *event, void *data);
 static void destroy(Ewl_Widget *w, void *event, void *data);
 static void populate_albums(Ewl_Widget *w, void *event, void *data);
 static void populate_directories(Ewl_Widget *w, void *event, void *data);
+static void save(Ewl_Widget *w, void *event, void *data);
 static void update_view(Ewl_Widget *w, void *event, void *data);
 static void window_fullscreen(Ewl_Widget *w, void *event, void *data);
 
@@ -23,6 +26,7 @@
 
 /*Ephoto Global Variables*/
 Ephoto_Main *em;
+Ewl_Widget *ae, *de;
 
 /*Destroy the Main Window*/
 static void destroy(Ewl_Widget *w, void *event, void *data)
@@ -82,6 +86,63 @@
return;
 }
 
+/*Cancel the Album Dialog*/
+static void cancel(Ewl_Widget *w, void *event, void *data)
+{
+

E CVS: apps/ephoto titan

2007-04-26 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_edit_view.c ephoto_single_view.c 


Log Message:
COMPLETELY center the image.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ephoto_edit_view.c  24 Apr 2007 21:38:10 -  1.15
+++ ephoto_edit_view.c  27 Apr 2007 04:37:40 -  1.16
@@ -12,8 +12,8 @@
 /*Add the edit view*/
 Ewl_Widget *add_edit_view(Ewl_Widget *c)
 {
-   Ewl_Widget *button, *vbox, *ivbox, *hbox, *bhbox, *nb;
-   Ewl_Widget *standard, *enhance, *advanced;
+   Ewl_Widget *button, *vbox, *ibox, *hbox, *bhbox, *nb;
+   Ewl_Widget *standard, *advanced;
 
hbox = add_box(c, EWL_ORIENTATION_HORIZONTAL, 2);
ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
@@ -31,12 +31,6 @@
 
add_standard_edit_tools(standard);
 
-   enhance = add_box(nb, EWL_ORIENTATION_VERTICAL, 2);
-ewl_object_maximum_w_set(EWL_OBJECT(enhance), 172);
-ewl_object_minimum_w_set(EWL_OBJECT(enhance), 172);
-ewl_object_fill_policy_set(EWL_OBJECT(enhance), EWL_FLAG_FILL_VFILL);
-ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), enhance, Enhancing 
Tools);
-
advanced = add_box(nb, EWL_ORIENTATION_VERTICAL, 2);
 ewl_object_maximum_w_set(EWL_OBJECT(advanced), 172);
 ewl_object_minimum_w_set(EWL_OBJECT(advanced), 172);
@@ -46,10 +40,12 @@
vbox = add_box(hbox, EWL_ORIENTATION_VERTICAL, 0);
ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);

-   ivbox = add_box(vbox, EWL_ORIENTATION_VERTICAL, 0);
-   ewl_object_fill_policy_set(EWL_OBJECT(ivbox), EWL_FLAG_FILL_ALL);
+   ibox = ewl_cell_new();
+   ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+   ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+   ewl_widget_show(ibox);
 
-em-eimage = add_image(ivbox, NULL, 0, NULL, NULL);
+em-eimage = add_image(ibox, NULL, 0, NULL, NULL);
 ewl_object_alignment_set(EWL_OBJECT(em-eimage), 
EWL_FLAG_ALIGN_CENTER);
 ewl_object_fill_policy_set(EWL_OBJECT(em-eimage), 
EWL_FLAG_FILL_SHRINK);

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_single_view.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ephoto_single_view.c22 Apr 2007 19:09:02 -  1.4
+++ ephoto_single_view.c27 Apr 2007 04:37:40 -  1.5
@@ -13,8 +13,10 @@
 ewl_object_fill_policy_set(EWL_OBJECT(em-single_vbox), 
EWL_FLAG_FILL_ALL);
 ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(c), em-single_vbox, 
Single);
 
-   ibox = add_box(em-single_vbox, EWL_ORIENTATION_VERTICAL, 0);
+   ibox = ewl_cell_new();
ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+   ewl_container_child_append(EWL_CONTAINER(em-single_vbox), ibox);
+   ewl_widget_show(ibox);
 
 em-simage = add_image(ibox, NULL, 0, NULL, NULL);
 ewl_object_alignment_set(EWL_OBJECT(em-simage), 
EWL_FLAG_ALIGN_CENTER);



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-04-26 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_main.c 


Log Message:
Small changes, including sizes, etc.  Also now we can switch the images when 
the tabs on the browser switch.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ephoto.h19 Apr 2007 03:17:11 -  1.16
+++ ephoto.h27 Apr 2007 05:55:37 -  1.17
@@ -121,6 +121,7 @@
 
 struct _Ephoto_Main
 {
+   char *current_album;
char *current_directory;
Ecore_List *albums;
Ecore_List *directories;
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ephoto_main.c   25 Apr 2007 21:54:53 -  1.27
+++ ephoto_main.c   27 Apr 2007 05:55:37 -  1.28
@@ -4,6 +4,7 @@
 static void destroy(Ewl_Widget *w, void *event, void *data);
 static void populate_albums(Ewl_Widget *w, void *event, void *data);
 static void populate_directories(Ewl_Widget *w, void *event, void *data);
+static void update_view(Ewl_Widget *w, void *event, void *data);
 static void window_fullscreen(Ewl_Widget *w, void *event, void *data);
 
 /*Ephoto Create Callbacks*/
@@ -31,6 +32,8 @@
ecore_list_destroy(em-albums);
ecore_list_destroy(em-directories);
ecore_dlist_destroy(em-images);
+   free(em-current_directory);
+   free(em-current_album);
free(em);
ewl_main_quit();
return;
@@ -53,12 +56,32 @@
 }
 
 /*Show the main view*/
-void show_main_view(Ewl_Widget *c, void *event, void *data)
+void show_main_view(Ewl_Widget *w, void *event, void *data)
 {
ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-main_nb), em-main_vbox);
ecore_dlist_goto_first(em-images);
 }
 
+/*Update the images based on the current tab*/
+static void update_view(Ewl_Widget *w, void *event, void *data)
+{
+   const char *text;
+   Ewl_Widget *page;
+
+   page = ewl_notebook_visible_page_get(EWL_NOTEBOOK(w));
+   text = ewl_widget_name_get(page);
+   if (!strcmp(text, Albums))
+   {
+   populate_albums(NULL, NULL, NULL);
+   }
+   else
+   {
+   populate_directories(NULL, NULL, NULL);
+   }
+
+   return;
+}
+
 /*Create the Main Ephoto Window*/
 void create_main_gui(void)
 {
@@ -71,7 +94,7 @@
em-directories = ecore_list_new();
em-images = ecore_dlist_new();
 
-   em-win = add_window(Ephoto!, 775, 540, destroy, NULL);
+   em-win = add_window(Ephoto!, 800, 600, destroy, NULL);
 
vbox = add_box(em-win, EWL_ORIENTATION_VERTICAL, 5);
ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
@@ -87,7 +110,7 @@
 ewl_notebook_tabbar_visible_set(EWL_NOTEBOOK(em-main_nb), 0);
 ewl_object_fill_policy_set(EWL_OBJECT(em-main_nb), EWL_FLAG_FILL_ALL);
 ewl_container_child_append(EWL_CONTAINER(hbox), em-main_nb);
-ewl_widget_show(em-main_nb);
+   ewl_widget_show(em-main_nb);
 
em-main_vbox = add_box(em-main_nb, EWL_ORIENTATION_VERTICAL, 2);
ewl_object_fill_policy_set(EWL_OBJECT(em-main_vbox), 
EWL_FLAG_FILL_ALL);
@@ -102,16 +125,18 @@
 
em-browser = ewl_notebook_new();
ewl_object_fill_policy_set(EWL_OBJECT(em-browser), 
EWL_FLAG_FILL_VFILL);
-   ewl_object_preferred_inner_w_set(EWL_OBJECT(em-browser), 175);
+   ewl_object_preferred_inner_w_set(EWL_OBJECT(em-browser), 200);
ewl_container_child_append(EWL_CONTAINER(em-view), em-browser);
ewl_widget_show(em-browser);
 
 em-atree = add_atree(em-browser);
-   ewl_object_maximum_w_set(EWL_OBJECT(em-atree), 175);
+   ewl_object_maximum_w_set(EWL_OBJECT(em-atree), 200);
+   ewl_widget_name_set(em-atree, Albums);
ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(em-browser), em-atree, 
Albums);
 
em-dtree = add_dtree(em-browser);
-   ewl_object_maximum_w_set(EWL_OBJECT(em-dtree), 175);
+   ewl_object_maximum_w_set(EWL_OBJECT(em-dtree), 200);
+   ewl_widget_name_set(em-dtree, File System);
ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(em-browser), em-dtree, 
File System);
 
em-view_box = ewl_notebook_new();
@@ -183,8 +208,11 @@
 
ewl_mvc_data_set(EWL_MVC(em-atree), em-albums);

-   populate_albums(NULL, NULL, Complete Library);
-   populate_directories(NULL, NULL, getenv(HOME));
+   em-current_album = strdup(Complete Library);
+   em-current_directory = strdup(getenv(HOME));
+
+   populate_albums(NULL, NULL, NULL);
+   ewl_callback_append(em-browser, EWL_CALLBACK_VALUE_CHANGED, 
update_view, NULL);
 
return;
 }
@@ -196,22 +224,20 @@
char *imagef;

E CVS: apps/ephoto titan

2007-04-25 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_main.c 


Log Message:
Cleanup warnings.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ephoto_main.c   24 Apr 2007 21:38:10 -  1.26
+++ ephoto_main.c   25 Apr 2007 21:54:53 -  1.27
@@ -218,17 +218,21 @@
 while (ecore_dlist_current(em-images))
 {
 imagef = ecore_dlist_current(em-images);
-
-thumb = add_image(em-fbox, imagef, 1, freebox_image_clicked, 
NULL);
-   ewl_image_constrain_set(EWL_IMAGE(thumb), 81);
-   ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
-   ewl_widget_name_set(thumb, imagef);
+   if(imagef)
+   {
+   thumb = add_image(em-fbox, imagef, 1, 
freebox_image_clicked, NULL);
+   ewl_image_constrain_set(EWL_IMAGE(thumb), 81);
+   ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
+   ewl_widget_name_set(thumb, imagef);
+   }
 
ecore_dlist_next(em-images);
 }
ecore_dlist_goto_first(em-images);
-   ewl_image_file_path_set(EWL_IMAGE(em-simage), 
ecore_dlist_current(em-images));
-
+   if(ecore_dlist_current(em-images)) 
+   {
+   ewl_image_file_path_set(EWL_IMAGE(em-simage), 
ecore_dlist_current(em-images));
+   }
 ewl_mvc_data_set(EWL_MVC(em-ltree), em-images);
ewl_mvc_dirty_set(EWL_MVC(em-ltree), 1);
 
@@ -281,16 +285,20 @@
while (ecore_dlist_current(em-images))
{
imagef = ecore_dlist_current(em-images);
-   
-   thumb = add_image(em-fbox, imagef, 1, 
freebox_image_clicked, NULL);
-   ewl_image_constrain_set(EWL_IMAGE(thumb), 81);
-   ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
-   ewl_widget_name_set(thumb, imagef);
-
+   if(imagef)
+   {
+   thumb = add_image(em-fbox, imagef, 1, 
freebox_image_clicked, NULL);
+   ewl_image_constrain_set(EWL_IMAGE(thumb), 81);
+   
ewl_object_alignment_set(EWL_OBJECT(thumb), EWL_FLAG_ALIGN_CENTER);
+   ewl_widget_name_set(thumb, imagef);
+   }
ecore_dlist_next(em-images);
}
ecore_dlist_goto_first(em-images);
-   ewl_image_file_path_set(EWL_IMAGE(em-simage), 
ecore_dlist_current(em-images));
+   if(ecore_dlist_current(em-images))
+   { 
+   ewl_image_file_path_set(EWL_IMAGE(em-simage), 
ecore_dlist_current(em-images));
+   }
ewl_mvc_data_set(EWL_MVC(em-ltree), em-images);
ewl_mvc_dirty_set(EWL_MVC(em-ltree), 1);
}



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-04-24 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_edit_view.c ephoto_main.c 


Log Message:
Fix the edit view arrows.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ephoto_edit_view.c  22 Apr 2007 18:58:52 -  1.14
+++ ephoto_edit_view.c  24 Apr 2007 21:38:10 -  1.15
@@ -15,10 +15,7 @@
Ewl_Widget *button, *vbox, *ivbox, *hbox, *bhbox, *nb;
Ewl_Widget *standard, *enhance, *advanced;
 
-vbox = add_box(c, EWL_ORIENTATION_VERTICAL, 5);
-ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
-
-   hbox = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 2);
+   hbox = add_box(c, EWL_ORIENTATION_HORIZONTAL, 2);
ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
 
nb = ewl_notebook_new();
@@ -45,14 +42,18 @@
 ewl_object_minimum_w_set(EWL_OBJECT(advanced), 172);
 ewl_object_fill_policy_set(EWL_OBJECT(advanced), EWL_FLAG_FILL_VFILL);
 ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), advanced, Advanced 
Tools);
-   ivbox = add_box(hbox, EWL_ORIENTATION_VERTICAL, 2);
-   ewl_object_alignment_set(EWL_OBJECT(ivbox), EWL_FLAG_ALIGN_CENTER);
+
+   vbox = add_box(hbox, EWL_ORIENTATION_VERTICAL, 0);
+   ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
+   
+   ivbox = add_box(vbox, EWL_ORIENTATION_VERTICAL, 0);
ewl_object_fill_policy_set(EWL_OBJECT(ivbox), EWL_FLAG_FILL_ALL);
 
 em-eimage = add_image(ivbox, NULL, 0, NULL, NULL);
 ewl_object_alignment_set(EWL_OBJECT(em-eimage), 
EWL_FLAG_ALIGN_CENTER);
 ewl_object_fill_policy_set(EWL_OBJECT(em-eimage), 
EWL_FLAG_FILL_SHRINK);
-   bhbox = add_box(ivbox, EWL_ORIENTATION_HORIZONTAL, 2);
+   
+   bhbox = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 2);
ewl_object_alignment_set(EWL_OBJECT(bhbox), EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(bhbox), EWL_FLAG_FILL_SHRINK);
 
@@ -64,7 +65,7 @@
 ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);
 ewl_attach_tooltip_text_set(button, Next Image);
 
-   return vbox;
+   return hbox;
 }
 
 /*Show the edit view*/
@@ -126,7 +127,7 @@
image = ecore_dlist_current(em-images);
}
 ewl_image_file_path_set(EWL_IMAGE(em-eimage), image);
-ewl_widget_configure(em-eimage-parent-parent);
+ewl_widget_configure(em-eimage-parent);
 
 return;
 }
@@ -165,7 +166,6 @@
 image-ow = nw;
 image-oh = nh;
ewl_object_preferred_inner_size_set(EWL_OBJECT(em-eimage), nw, nh);
-   ewl_widget_configure(em-eimage);
ewl_widget_configure(em-eimage-parent);
 
return;
@@ -186,7 +186,6 @@
 image-ow = nw;
 image-oh = nh;
ewl_object_preferred_inner_size_set(EWL_OBJECT(em-eimage), nh, nw);
-   ewl_widget_configure(em-eimage);
ewl_widget_configure(em-eimage-parent);
 
return;
@@ -207,7 +206,6 @@
 image-ow = nw;
 image-oh = nh;
 ewl_object_preferred_inner_size_set(EWL_OBJECT(em-eimage), nw, nh);
-   ewl_widget_configure(em-eimage);
ewl_widget_configure(em-eimage-parent);
 
return;
@@ -227,7 +225,6 @@
 image-ow = nw;
 image-oh = nh;
 ewl_object_preferred_inner_size_set(EWL_OBJECT(em-eimage), nw, nh);
-   ewl_widget_configure(em-eimage);
ewl_widget_configure(em-eimage-parent);
 
return;
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ephoto_main.c   22 Apr 2007 18:58:52 -  1.25
+++ ephoto_main.c   24 Apr 2007 21:38:10 -  1.26
@@ -102,17 +102,16 @@
 
em-browser = ewl_notebook_new();
ewl_object_fill_policy_set(EWL_OBJECT(em-browser), 
EWL_FLAG_FILL_VFILL);
+   ewl_object_preferred_inner_w_set(EWL_OBJECT(em-browser), 175);
ewl_container_child_append(EWL_CONTAINER(em-view), em-browser);
ewl_widget_show(em-browser);
 
 em-atree = add_atree(em-browser);
-ewl_object_minimum_w_set(EWL_OBJECT(em-atree), 172);
-   ewl_object_maximum_w_set(EWL_OBJECT(em-atree), 172);
+   ewl_object_maximum_w_set(EWL_OBJECT(em-atree), 175);
ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(em-browser), em-atree, 
Albums);
 
em-dtree = add_dtree(em-browser);
-   ewl_object_minimum_w_set(EWL_OBJECT(em-dtree), 172);
-   ewl_object_maximum_w_set(EWL_OBJECT(em-dtree), 172);
+   ewl_object_maximum_w_set(EWL_OBJECT(em-dtree), 175);
ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(em-browser), em-dtree, 
File System);

E CVS: apps/ephoto titan

2007-04-22 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_edit_view.c ephoto_main.c 


Log Message:
Keep the toolbar when switching to edit view.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto_edit_view.c  19 Apr 2007 04:09:15 -  1.13
+++ ephoto_edit_view.c  22 Apr 2007 18:58:52 -  1.14
@@ -12,7 +12,8 @@
 /*Add the edit view*/
 Ewl_Widget *add_edit_view(Ewl_Widget *c)
 {
-   Ewl_Widget *button, *vbox, *hbox, *nb, *standard, *enhance, *advanced;
+   Ewl_Widget *button, *vbox, *ivbox, *hbox, *bhbox, *nb;
+   Ewl_Widget *standard, *enhance, *advanced;
 
 vbox = add_box(c, EWL_ORIENTATION_VERTICAL, 5);
 ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
@@ -44,22 +45,22 @@
 ewl_object_minimum_w_set(EWL_OBJECT(advanced), 172);
 ewl_object_fill_policy_set(EWL_OBJECT(advanced), EWL_FLAG_FILL_VFILL);
 ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), advanced, Advanced 
Tools);
+   ivbox = add_box(hbox, EWL_ORIENTATION_VERTICAL, 2);
+   ewl_object_alignment_set(EWL_OBJECT(ivbox), EWL_FLAG_ALIGN_CENTER);
+   ewl_object_fill_policy_set(EWL_OBJECT(ivbox), EWL_FLAG_FILL_ALL);
 
-em-eimage = add_image(hbox, NULL, 0, NULL, NULL);
+em-eimage = add_image(ivbox, NULL, 0, NULL, NULL);
 ewl_object_alignment_set(EWL_OBJECT(em-eimage), 
EWL_FLAG_ALIGN_CENTER);
 ewl_object_fill_policy_set(EWL_OBJECT(em-eimage), 
EWL_FLAG_FILL_SHRINK);
+   bhbox = add_box(ivbox, EWL_ORIENTATION_HORIZONTAL, 2);
+   ewl_object_alignment_set(EWL_OBJECT(bhbox), EWL_FLAG_ALIGN_CENTER);
+   ewl_object_fill_policy_set(EWL_OBJECT(bhbox), EWL_FLAG_FILL_SHRINK);
 
-   hbox = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 2);
-   ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
-   ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK);
-
-   button = add_button(hbox, Return to main view, NULL, show_main_view, 
NULL);
-
-button = add_button(hbox, NULL, PACKAGE_DATA_DIR 
/images/media-seek-backward.png, previous_image, NULL);
+button = add_button(bhbox, NULL, PACKAGE_DATA_DIR 
/images/media-seek-backward.png, previous_image, NULL);
 ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);
 ewl_attach_tooltip_text_set(button, Previous Image);
 
-button = add_button(hbox, NULL, PACKAGE_DATA_DIR 
/images/media-seek-forward.png, next_image, NULL);
+button = add_button(bhbox, NULL, PACKAGE_DATA_DIR 
/images/media-seek-forward.png, next_image, NULL);
 ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);
 ewl_attach_tooltip_text_set(button, Next Image);
 
@@ -125,7 +126,7 @@
image = ecore_dlist_current(em-images);
}
 ewl_image_file_path_set(EWL_IMAGE(em-eimage), image);
-ewl_widget_configure(em-eimage-parent);
+ewl_widget_configure(em-eimage-parent-parent);
 
 return;
 }
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ephoto_main.c   19 Apr 2007 04:09:15 -  1.24
+++ ephoto_main.c   22 Apr 2007 18:58:52 -  1.25
@@ -131,7 +131,7 @@
ewl_box_spacing_set(EWL_BOX(em-toolbar), 5);
ewl_object_alignment_set(EWL_OBJECT(em-toolbar), 
EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(em-toolbar), 
EWL_FLAG_FILL_SHRINK);
-   ewl_container_child_append(EWL_CONTAINER(em-main_vbox), em-toolbar);
+   ewl_container_child_append(EWL_CONTAINER(vbox), em-toolbar);
ewl_widget_show(em-toolbar);
 
 button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/normal_view.png, show_normal_view, NULL);



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-04-22 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_list_view.c ephoto_normal_view.c ephoto_single_view.c 


Log Message:
When these are clicked the main notebook page needs to be made visible.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_list_view.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ephoto_list_view.c  19 Apr 2007 04:09:15 -  1.19
+++ ephoto_list_view.c  22 Apr 2007 19:09:02 -  1.20
@@ -22,6 +22,7 @@
 /*Show the list view*/
 void show_list_view(Ewl_Widget *w, void *event, void *data)
 {
+   ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-main_nb), em-main_vbox);
 ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-view_box), 
em-list_vbox);
 }
 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_normal_view.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto_normal_view.c19 Apr 2007 04:09:15 -  1.12
+++ ephoto_normal_view.c22 Apr 2007 19:09:02 -  1.13
@@ -27,6 +27,7 @@
 /*Show the normal view*/
 void show_normal_view(Ewl_Widget *w, void *event, void *data)
 {
+   ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-main_nb), em-main_vbox);
ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-view_box), 
em-fbox_vbox);
 }
 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_single_view.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto_single_view.c19 Apr 2007 23:31:19 -  1.3
+++ ephoto_single_view.c22 Apr 2007 19:09:02 -  1.4
@@ -38,6 +38,7 @@
 /*Show the single view*/
 void show_single_view(Ewl_Widget *w, void *event, void *data)
 {
+   ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-main_nb), em-main_vbox);
 ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-view_box), 
em-single_vbox);
ewl_image_file_path_set(EWL_IMAGE(em-simage), 
ecore_dlist_current(em-images));
return;



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-04-19 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_browsing.c ephoto_single_view.c 


Log Message:
Minor changes, make the list from file system images a dlist, and better align 
the image seek buttons on single view.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_browsing.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto_browsing.c   24 Feb 2007 22:57:09 -  1.3
+++ ephoto_browsing.c   19 Apr 2007 23:31:18 -  1.4
@@ -57,8 +57,8 @@
 if (ecore_file_is_dir(directory))
 {
 ls = ecore_list_new();
-files = ecore_list_new();
-   ecore_list_set_free_cb(files, free);
+files = ecore_dlist_new();
+   ecore_dlist_set_free_cb(files, free);
 
 ls = ecore_file_ls(directory);
 while (!ecore_list_is_empty(ls))
@@ -78,15 +78,15 @@
 }
if (fnmatch(*.[Jj][Pp][Ee][Gg], path, 0) == 0)
{
-   ecore_list_append(files, strdup(path));
+   ecore_dlist_append(files, strdup(path));
}
else if (fnmatch(*.[Jj][Pp][Gg], path, 0) == 
0)
{
-   ecore_list_append(files, strdup(path));
+   ecore_dlist_append(files, strdup(path));
}
else if (fnmatch(*.[Pp][Nn][Gg], path, 0) == 
0)
{
-   ecore_list_append(files, strdup(path));
+   ecore_dlist_append(files, strdup(path));
}
}
}
@@ -95,6 +95,6 @@
{
files = NULL;
}
-   ecore_list_goto_first(files);
+   ecore_dlist_goto_first(files);
return files;
 }
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_single_view.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ephoto_single_view.c19 Apr 2007 04:09:15 -  1.2
+++ ephoto_single_view.c19 Apr 2007 23:31:19 -  1.3
@@ -7,13 +7,16 @@
 /*Add the single view*/
 Ewl_Widget *add_single_view(Ewl_Widget *c)
 {
-   Ewl_Widget *hbox, *button;
+   Ewl_Widget *hbox, *ibox, *button;
 
 em-single_vbox = add_box(c, EWL_ORIENTATION_VERTICAL, 5);
 ewl_object_fill_policy_set(EWL_OBJECT(em-single_vbox), 
EWL_FLAG_FILL_ALL);
 ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(c), em-single_vbox, 
Single);
 
-em-simage = add_image(em-single_vbox, NULL, 0, NULL, NULL);
+   ibox = add_box(em-single_vbox, EWL_ORIENTATION_VERTICAL, 0);
+   ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+
+em-simage = add_image(ibox, NULL, 0, NULL, NULL);
 ewl_object_alignment_set(EWL_OBJECT(em-simage), 
EWL_FLAG_ALIGN_CENTER);
 ewl_object_fill_policy_set(EWL_OBJECT(em-simage), 
EWL_FLAG_FILL_SHRINK);
 



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-04-18 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
Makefile.am ephoto.c ephoto.h ephoto_edit_view.c ephoto_gui.c 
ephoto_main.c 
Added Files:
ephoto_single_view.c 


Log Message:
Add some more stuff to ephoto including directory viewing now.
The old edit view has become single view, and there is a completely
new edit view that is much more editing specific.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 23 Mar 2007 23:50:51 -  1.7
+++ Makefile.am 19 Apr 2007 03:17:11 -  1.8
@@ -16,6 +16,7 @@
  ephoto_main.c \
  ephoto_nls.c \
  ephoto_normal_view.c \
+ ephoto_single_view.c \
  ephoto_slideshow.c \
  ephoto_utils.c
 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ephoto.c30 Mar 2007 02:47:16 -  1.4
+++ ephoto.c19 Apr 2007 03:17:11 -  1.5
@@ -266,9 +266,6 @@
bind_textdomain_codeset(PACKAGE, UTF-8);
textdomain(PACKAGE);
 #endif
-   /*Use our own theme*/
-   ewl_theme_theme_set(PACKAGE_DATA_DIR /themes/ephoto.edj);
-
/*Start the GUI*/
create_main_gui();

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ephoto.h30 Mar 2007 02:47:16 -  1.15
+++ ephoto.h19 Apr 2007 03:17:11 -  1.16
@@ -68,6 +68,7 @@
 Ewl_Widget *add_box(Ewl_Widget *c, Ewl_Orientation orientation, int spacing);
 Ewl_Widget *add_button(Ewl_Widget *c, const char *txt, const char *img, void 
*cb, void *data);
 Ewl_Widget *add_entry(Ewl_Widget *c, const char *txt, void *cb, void *data);
+Ewl_Widget *add_icon(Ewl_Widget *c, const char *lbl, const char *img, int 
thumbnail, void *cb, void *data);
 Ewl_Widget *add_image(Ewl_Widget *c, const char *img, int thumbnail, void *cb, 
void *data);
 Ewl_Widget *add_label(Ewl_Widget *c, const char *lbl);
 Ewl_Widget *add_menubar(Ewl_Widget *c);
@@ -86,7 +87,6 @@
 
 /* Ephoto Edit View */
 Ewl_Widget *add_edit_view(Ewl_Widget *c);
-void add_edit_tools(Ewl_Widget *c);
 
 /* Ephoto List View */
 Ewl_Widget *add_list_view(Ewl_Widget *c);
@@ -96,6 +96,9 @@
 Ewl_Widget *add_normal_view(Ewl_Widget *c);
 void freebox_image_clicked(Ewl_Widget *w, void *event, void *data);
 
+/* Ephoto Single View */
+Ewl_Widget *add_single_view(Ewl_Widget *c);
+
 /* Ephoto Slideshow */
 void start_slideshow(Ewl_Widget *w, void *event, void *data);
 
@@ -104,27 +107,39 @@
 const char *image_pixels_string_get(const char *file);
 void image_pixels_int_get(const char *file, int *width, int *height);
 
-/* Ephoto Views */
-void show_normal_view(Ewl_Widget *w, void *event, void *data);
+/* Ephoto Main View */
+void show_main_view(Ewl_Widget *w, void *event, void *data);
 void show_edit_view(Ewl_Widget *w, void *event, void *data);
+
+/* Ephoto Viewer Views */
+void show_normal_view(Ewl_Widget *w, void *event, void *data);
 void show_list_view(Ewl_Widget *w, void *event, void *data);
+void show_single_view(Ewl_Widget *w, void *event, void *data);
 
 /* Ephoto Global Variables */
 typedef struct _Ephoto_Main Ephoto_Main;
 
 struct _Ephoto_Main
 {
+   char *current_directory;
Ecore_List *albums;
+   Ecore_List *directories;
Ecore_List *images;
Ewl_Widget *atree;
-   Ewl_Widget *edit_tools;
+   Ewl_Widget *browser;
+   Ewl_Widget *dtree;
Ewl_Widget *edit_vbox;
Ewl_Widget *eimage;
Ewl_Widget *fbox_vbox;
Ewl_Widget *fbox;
Ewl_Widget *list_vbox;
Ewl_Widget *ltree;
+   Ewl_Widget *main_nb;
+   Ewl_Widget *main_vbox;
+   Ewl_Widget *simage;
+   Ewl_Widget *single_vbox;
Ewl_Widget *toolbar;
+   Ewl_Widget *view;
Ewl_Widget *view_box;
Ewl_Widget *win;
sqlite3 *db;
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto_edit_view.c  30 Mar 2007 02:47:16 -  1.11
+++ ephoto_edit_view.c  19 Apr 2007 03:17:11 -  1.12
@@ -1,6 +1,7 @@
 #include ephoto.h
 
 /*Ephoto Image Manipulation*/
+static void add_standard_edit_tools(Ewl_Widget *c);
 static void previous_image(Ewl_Widget *w, void *event, void *data);
 static void next_image(Ewl_Widget *w, void *event, void *data);
 static void flip_image_horizontal(Ewl_Widget *w, void *event, void *data);

E CVS: apps/ephoto titan

2007-04-18 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_edit_view.c ephoto_list_view.c ephoto_main.c 
ephoto_normal_view.c ephoto_single_view.c 


Log Message:
Add functionality to go to single view when an image from normal view or list 
view is clicked.
Also add functionality to keep the current image when moving to edit view.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto_edit_view.c  19 Apr 2007 03:17:11 -  1.12
+++ ephoto_edit_view.c  19 Apr 2007 04:09:15 -  1.13
@@ -70,7 +70,6 @@
 void show_edit_view(Ewl_Widget *w, void *event, void *data)
 {
 ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-main_nb), 
em-edit_vbox);
-   ecore_dlist_goto_first(em-images);
ewl_image_file_path_set(EWL_IMAGE(em-eimage), 
ecore_dlist_current(em-images));
return;
 }
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_list_view.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ephoto_list_view.c  3 Apr 2007 20:12:01 -   1.18
+++ ephoto_list_view.c  19 Apr 2007 04:09:15 -  1.19
@@ -2,7 +2,9 @@
 
 static Ewl_Widget *list_view_new(void *data, unsigned int row, unsigned int 
column);
 static Ewl_Widget *list_header_fetch(void *data, unsigned int column);
+static void iterate(char *point2);
 static void *list_data_fetch(void *data, unsigned int row, unsigned int 
column);
+static void list_item_clicked(Ewl_Widget *w, void *event, void *data);
 static unsigned int list_data_count(void *data);
 
 /*Add the list view*/
@@ -23,6 +25,32 @@
 ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-view_box), 
em-list_vbox);
 }
 
+/*Iterate the list to our spot*/
+static void iterate(char *point2)
+{
+char *point1;
+
+ecore_dlist_goto_first(em-images);
+while(ecore_dlist_current(em-images))
+{
+point1 = ecore_dlist_current(em-images);
+if (!strcmp(point1, point2)) return;
+ecore_dlist_next(em-images);
+}
+}
+
+/*Go to single view*/
+static void list_item_clicked(Ewl_Widget *w, void *event, void *data)
+{
+   char *image;
+
+   image = data;
+   iterate(image);
+   show_single_view(NULL, NULL, NULL);
+
+   free(image);
+}
+
 /*Create and Add a Tree to the Container c*/
 Ewl_Widget *add_ltree(Ewl_Widget *c)
 {
@@ -71,7 +99,7 @@
 
hbox = add_box(NULL, EWL_ORIENTATION_HORIZONTAL, 10);
ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_HFILL);
-// ewl_callback_append(hbox, EWL_CALLBACK_CLICKED, show_edit_view, 
strdup(image));
+   ewl_callback_append(hbox, EWL_CALLBACK_CLICKED, list_item_clicked, 
strdup(image));
ewl_widget_name_set(hbox, image);
 
 img = add_image(hbox, image, 1, NULL, NULL);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ephoto_main.c   19 Apr 2007 03:17:11 -  1.23
+++ ephoto_main.c   19 Apr 2007 04:09:15 -  1.24
@@ -221,7 +221,7 @@
 imagef = ecore_dlist_current(em-images);
 
 thumb = add_image(em-fbox, imagef, 1, freebox_image_clicked, 
NULL);
-   ewl_image_constrain_set(EWL_IMAGE(thumb), 64);
+   ewl_image_constrain_set(EWL_IMAGE(thumb), 81);
ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
ewl_widget_name_set(thumb, imagef);
 
@@ -284,7 +284,7 @@
imagef = ecore_dlist_current(em-images);

thumb = add_image(em-fbox, imagef, 1, 
freebox_image_clicked, NULL);
-   ewl_image_constrain_set(EWL_IMAGE(thumb), 64);
+   ewl_image_constrain_set(EWL_IMAGE(thumb), 81);
ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
ewl_widget_name_set(thumb, imagef);
 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_normal_view.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto_normal_view.c30 Mar 2007 02:47:16 -  1.11
+++ ephoto_normal_view.c19 Apr 2007 04:09:15 -  1.12
@@ -1,5 +1,7 @@
 #include ephoto.h
 
+static void iterate(char *point2);
+
 /*Add the normal view*/
 Ewl_Widget *add_normal_view(Ewl_Widget *c)
 {
@@ -28,13 +30,29 @@
ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-view_box), 
em-fbox_vbox);
 }
 
+/*Find our spot in the list*/
+static void iterate(char *point2)
+{
+

E CVS: apps/ephoto titan

2007-04-03 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_list_view.c ephoto_main.c 


Log Message:
Make her compile again due to ewl changes.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_list_view.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ephoto_list_view.c  30 Mar 2007 02:47:16 -  1.17
+++ ephoto_list_view.c  3 Apr 2007 20:12:01 -   1.18
@@ -1,9 +1,9 @@
 #include ephoto.h
 
-static Ewl_Widget *list_view_new(void *data, int column, int row);
-static Ewl_Widget *list_header_fetch(void *data, int column);
+static Ewl_Widget *list_view_new(void *data, unsigned int row, unsigned int 
column);
+static Ewl_Widget *list_header_fetch(void *data, unsigned int column);
 static void *list_data_fetch(void *data, unsigned int row, unsigned int 
column);
-static int list_data_count(void *data);
+static unsigned int list_data_count(void *data);
 
 /*Add the list view*/
 Ewl_Widget *add_list_view(Ewl_Widget *c)
@@ -54,7 +54,7 @@
 
 
 /* The view of the images */
-static Ewl_Widget *list_view_new(void *data, int row, int column)
+static Ewl_Widget *list_view_new(void *data, unsigned int row, unsigned int 
column)
 {
const char *image;
char info[PATH_MAX];
@@ -85,7 +85,7 @@
 }
 
 /* The header for the tree */
-static Ewl_Widget *list_header_fetch(void *data, int column)
+static Ewl_Widget *list_header_fetch(void *data, unsigned int column)
 {
Ewl_Widget *label;
 
@@ -110,7 +110,7 @@
 }
 
 /* The number of images the view is displaying */
-static int list_data_count(void *data)
+static unsigned int list_data_count(void *data)
 {
int val;
 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ephoto_main.c   30 Mar 2007 02:47:16 -  1.21
+++ ephoto_main.c   3 Apr 2007 20:12:01 -   1.22
@@ -9,10 +9,10 @@
 static Ewl_Widget *add_atree(Ewl_Widget *c);
 
 /*Ephoto MVC Callbacks*/
-static Ewl_Widget *album_view_new(void *data, int column, int row);
-static Ewl_Widget *album_header_fetch(void *data, int column);
+static Ewl_Widget *album_view_new(void *data, unsigned int row, unsigned int 
column);
+static Ewl_Widget *album_header_fetch(void *data, unsigned int column);
 static void *album_data_fetch(void *data, unsigned int row, unsigned int 
column);
-static int album_data_count(void *data);
+static unsigned int album_data_count(void *data);
 
 /*Ephoto Global Variables*/
 Ephoto_Main *em;
@@ -203,7 +203,7 @@
 
 
 /* The view of the users albums */
-static Ewl_Widget *album_view_new(void *data, int column, int row)
+static Ewl_Widget *album_view_new(void *data, unsigned int row, unsigned int 
column)
 {
const char *album;
Ewl_Widget *icon;
@@ -226,7 +226,7 @@
 }
 
 /* The header for the tree */
-static Ewl_Widget *album_header_fetch(void *data, int column)
+static Ewl_Widget *album_header_fetch(void *data, unsigned int column)
 {
Ewl_Widget *label;
 
@@ -251,7 +251,7 @@
 }
 
 /* The number of albums the view is displaying */
-static int album_data_count(void *data)
+static unsigned int album_data_count(void *data)
 {
int val;
 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-29 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto


Modified Files:
configure.in 


Log Message:
Update the ecore check to only check for ecore-file

===
RCS file: /cvs/e/e17/apps/ephoto/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.in23 Mar 2007 02:06:30 -  1.7
+++ configure.in29 Mar 2007 14:21:51 -  1.8
@@ -99,7 +99,7 @@
]
 )
 
-PKG_CHECK_MODULES([ECORE], ecore,
+PKG_CHECK_MODULES([ECORE], ecore-file,
[
   have_ecore=Yes
],



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-29 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_edit_view.c ephoto_exif.c ephoto_gui.c 
ephoto_list_view.c ephoto_main.c ephoto_normal_view.c 
ephoto_slideshow.c 


Log Message:
More abstraction. This makes things easier and faster.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto.h29 Mar 2007 00:24:16 -  1.13
+++ ephoto.h30 Mar 2007 00:45:12 -  1.14
@@ -25,16 +25,16 @@
 
 /* NLS */
 #ifdef ENABLE_NLS
-# include libintl.h
-# include locale.h
-# define _(str) gettext(str)
-# define gettext_noop(str) str
-# define N_(str) gettext_noop(str)
+#include libintl.h
+#include locale.h
+#define _(str) gettext(str)
+#define gettext_noop(str) str
+#define N_(str) gettext_noop(str)
 #else
-# define _(str) (str)
-# define gettext_noop(str) str
-# define N_(str) gettext_noop(str)
-# define gettext(str) ((char*) (str))
+#define _(str) (str)
+#define gettext_noop(str) str
+#define N_(str) gettext_noop(str)
+#define gettext(str) ((char*) (str))
 #endif
 
 /* NLS callbacks */
@@ -65,11 +65,16 @@
 void ephoto_db_close(sqlite3 *db);
 
 /* Ephoto Gui */
+Ewl_Widget *add_box(Ewl_Widget *c, Ewl_Orientation orientation, int spacing);
 Ewl_Widget *add_button(Ewl_Widget *c, const char *txt, const char *img, void 
*cb, void *data);
+Ewl_Widget *add_entry(Ewl_Widget *c, const char *txt, void *cb, void *data);
 Ewl_Widget *add_image(Ewl_Widget *c, const char *img, int thumbnail, void *cb, 
void *data);
 Ewl_Widget *add_label(Ewl_Widget *c, const char *lbl);
+Ewl_Widget *add_menubar(Ewl_Widget *c);
+Ewl_Widget *add_menu(Ewl_Widget *c, const char *lbl);
 Ewl_Widget *add_text(Ewl_Widget *c, const char *text);
 Ewl_Widget *add_shadow(Ewl_Widget *c);
+Ewl_Widget *add_window(const char *name, int width, int height, void *cb, void 
*data);
 
 /* Ephoto Imaging */
 unsigned int *flip_horizontal(Ewl_Widget *image);
@@ -118,7 +123,6 @@
Ewl_Widget *fbox;
Ewl_Widget *list_vbox;
Ewl_Widget *ltree;
-   Ewl_Widget *tbar;
Ewl_Widget *toolbar;
Ewl_Widget *view_box;
Ewl_Widget *win;
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ephoto_edit_view.c  29 Mar 2007 00:24:16 -  1.9
+++ ephoto_edit_view.c  30 Mar 2007 00:45:12 -  1.10
@@ -11,10 +11,8 @@
 /*Add the edit view*/
 Ewl_Widget *add_edit_view(Ewl_Widget *c)
 {
-em-edit_vbox = ewl_vbox_new();
+em-edit_vbox = add_box(c, EWL_ORIENTATION_VERTICAL, 5);
 ewl_object_fill_policy_set(EWL_OBJECT(em-edit_vbox), 
EWL_FLAG_FILL_ALL);
-ewl_container_child_append(EWL_CONTAINER(c), em-edit_vbox);
-ewl_widget_show(em-edit_vbox);
 ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(c), em-edit_vbox, Edit);
 
 em-eimage = add_image(em-edit_vbox, NULL, 0, NULL, NULL);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_exif.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto_exif.c   29 Mar 2007 00:24:16 -  1.13
+++ ephoto_exif.c   30 Mar 2007 00:45:12 -  1.14
@@ -124,7 +124,7 @@
 void display_exif_dialog(Ewl_Widget *w, void *event, void *data)
 {
const char *img;
-   Ewl_Widget *win, *vbox, *image, *sp, *list, *text;
+   Ewl_Widget *win = NULL, *vbox, *image, *sp, *list, *text;
Ewl_Model *model;
Ewl_View *view;

@@ -134,18 +134,11 @@
return;
}
 
-   win = ewl_window_new();
-ewl_window_title_set(EWL_WINDOW(win), Ephoto Exif Info);
-ewl_window_name_set(EWL_WINDOW(win), Ephoto Exif Info);
+   win = add_window(Ephoto Exif Info, 310, 460, close_dialog, win);
ewl_window_dialog_set(EWL_WINDOW(win), 1);
-ewl_object_size_request(EWL_OBJECT(win), 310, 460);
-ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, close_dialog, 
win);
-   ewl_widget_show(win);
 
-   vbox = ewl_vbox_new();
+   vbox = add_box(win, EWL_ORIENTATION_VERTICAL, 5);
ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
-   ewl_container_child_append(EWL_CONTAINER(win), vbox);
-   ewl_widget_show(vbox);
 
text = add_text(vbox, Preview);
 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ephoto_gui.c25 Feb 2007 04:30:57 -  1.5
+++ ephoto_gui.c30 Mar 2007 00:45:12 -  1.6
@@ -1,31 +1,50 @@
 #include ephoto.h
 
+/*Create and Add a

E CVS: apps/ephoto titan

2007-03-29 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto


Modified Files:
main.edc 


Log Message:
More abstraction. This makes things easier and faster.

===
RCS file: /cvs/e/e17/apps/ephoto/data/themes/ephoto/main.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- main.edc29 Mar 2007 00:24:16 -  1.5
+++ main.edc30 Mar 2007 00:45:11 -  1.6
@@ -62,7 +62,6 @@
item: /tooltip/group /ephoto/window;
item: /tooltip/hoffset 5;
item: /tooltip/voffset 5;
-   item: /tree2/vbox/scrollpane/overlay/vbox/node/row/cell/hbox/group 
/ephoto/select;
item: /vscrollbar/decrement/group /ephoto/vscrollbar/decrement;
item: /vscrollbar/increment/group /ephoto/vscrollbar/increment;
item: /vseeker/group /ephoto/vrunner;



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-29 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.c ephoto.h ephoto_edit_view.c ephoto_gui.c 
ephoto_list_view.c ephoto_main.c ephoto_normal_view.c 
ephoto_slideshow.c 


Log Message:
Add edit tools back. I really need a better design.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto.c28 Mar 2007 17:50:49 -  1.3
+++ ephoto.c30 Mar 2007 02:47:16 -  1.4
@@ -266,9 +266,9 @@
bind_textdomain_codeset(PACKAGE, UTF-8);
textdomain(PACKAGE);
 #endif
-   /*Use our own custom theme*/
+   /*Use our own theme*/
ewl_theme_theme_set(PACKAGE_DATA_DIR /themes/ephoto.edj);
-   
+
/*Start the GUI*/
create_main_gui();

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ephoto.h30 Mar 2007 00:45:12 -  1.14
+++ ephoto.h30 Mar 2007 02:47:16 -  1.15
@@ -72,6 +72,7 @@
 Ewl_Widget *add_label(Ewl_Widget *c, const char *lbl);
 Ewl_Widget *add_menubar(Ewl_Widget *c);
 Ewl_Widget *add_menu(Ewl_Widget *c, const char *lbl);
+Ewl_Widget *add_menu_item(Ewl_Widget *c, const char *lbl, const char *img, 
void *cb, void *data);
 Ewl_Widget *add_text(Ewl_Widget *c, const char *text);
 Ewl_Widget *add_shadow(Ewl_Widget *c);
 Ewl_Widget *add_window(const char *name, int width, int height, void *cb, void 
*data);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ephoto_edit_view.c  30 Mar 2007 00:45:12 -  1.10
+++ ephoto_edit_view.c  30 Mar 2007 02:47:16 -  1.11
@@ -19,21 +19,21 @@
 ewl_object_alignment_set(EWL_OBJECT(em-eimage), 
EWL_FLAG_ALIGN_CENTER);
 ewl_object_fill_policy_set(EWL_OBJECT(em-eimage), 
EWL_FLAG_FILL_SHRINK);
 
+em-edit_tools = add_box(em-edit_vbox, EWL_ORIENTATION_HORIZONTAL, 3);
+ewl_object_alignment_set(EWL_OBJECT(em-edit_tools), 
EWL_FLAG_ALIGN_CENTER);
+   ewl_object_fill_policy_set(EWL_OBJECT(em-edit_tools), 
EWL_FLAG_FILL_SHRINK);
+add_edit_tools(em-edit_tools);
+
return em-edit_vbox;
 }
 
 /*Show the edit view*/
 void show_edit_view(Ewl_Widget *w, void *event, void *data)
 {
-   char *path = data;
-
 ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-view_box), 
em-edit_vbox);
-   if (path) 
-   {
-   ewl_image_file_path_set(EWL_IMAGE(em-eimage), path);
-   free(path);
-   }
-   else ewl_image_file_path_set(EWL_IMAGE(em-eimage), 
ecore_dlist_current(em-images));
+   ecore_dlist_goto_first(em-images);
+   ewl_image_file_path_set(EWL_IMAGE(em-eimage), 
ecore_dlist_current(em-images));
+   return;
 }
 
 /*Add edit tools to container c*/
@@ -71,14 +71,12 @@
 
 image = add_image(c, PACKAGE_DATA_DIR 
/images/media-seek-backward.png, 0, previous_image, NULL);
 ewl_image_constrain_set(EWL_IMAGE(image), 30);
-   ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_RIGHT);
ewl_attach_tooltip_text_set(image, Previous Image);
 
 image = add_image(c, PACKAGE_DATA_DIR 
/images/media-seek-forward.png, 0, next_image, NULL);
 ewl_image_constrain_set(EWL_IMAGE(image), 30);
-   ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_RIGHT);
ewl_attach_tooltip_text_set(image, Next Image);
-
+   
return;
 }
 
@@ -118,8 +116,6 @@
 
return;
 }
-
-
 
 /*Flip the image 180 degrees horizontally*/
 static void flip_image_horizontal(Ewl_Widget *w, void *event, void *data)
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ephoto_gui.c30 Mar 2007 00:45:12 -  1.6
+++ ephoto_gui.c30 Mar 2007 02:47:16 -  1.7
@@ -115,11 +115,29 @@
Ewl_Widget *menu;

menu = ewl_menu_new();
-   if(lbl) ewl_label_text_set(EWL_LABEL(menu), lbl);
+   if(lbl) ewl_button_label_set(EWL_BUTTON(menu), lbl);
+   ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
if(c) ewl_container_child_append(EWL_CONTAINER(c), menu);
ewl_widget_show(menu);
 
return menu;
+}
+
+/*Create and Add a Menu Item to the Container c*/
+Ewl_Widget *add_menu_item(Ewl_Widget *c, const char *lbl, const char *img, 
void *cb, void *data)
+{
+   Ewl_Widget *mi;
+
+   mi = ewl_menu_item_new();
+   if(img) ewl_button_image_set(EWL_BUTTON(mi), img, NULL);
+   if(lbl)

E CVS: apps/ephoto titan

2007-03-28 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.c ephoto_list_view.c ephoto_main.c 


Log Message:
Update ephoto to api changes and shuffle some code.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ephoto.c24 Feb 2007 23:30:49 -  1.2
+++ ephoto.c28 Mar 2007 17:50:49 -  1.3
@@ -271,6 +271,9 @@

/*Start the GUI*/
create_main_gui();
+   
+   /*Star the ewl loop*/
+   ewl_main();
 
return 0;
 }
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_list_view.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto_list_view.c  23 Mar 2007 23:10:28 -  1.13
+++ ephoto_list_view.c  28 Mar 2007 17:50:49 -  1.14
@@ -51,18 +51,20 @@
ewl_model_data_fetch_set(model, list_data_fetch);
ewl_model_data_count_set(model, list_data_count);
 
+view = ewl_view_new();
+ewl_view_widget_fetch_set(view, list_view_new);
+ewl_view_header_fetch_set(view, list_header_fetch);
+
tree = ewl_tree2_new();
ewl_tree2_headers_visible_set(EWL_TREE2(tree), 0);
ewl_tree2_fixed_rows_set(EWL_TREE2(tree), 1);
+   ewl_tree2_column_count_set(EWL_TREE2(tree), 1);
ewl_mvc_model_set(EWL_MVC(tree), model);
+   ewl_mvc_view_set(EWL_MVC(tree), view);
+   ewl_mvc_selection_mode_set(EWL_MVC(tree), EWL_SELECTION_MODE_SINGLE);
ewl_object_fill_policy_set(EWL_OBJECT(tree), EWL_FLAG_FILL_ALL);
ewl_container_child_append(EWL_CONTAINER(c), tree);
ewl_widget_show(tree);
-
-   view = ewl_view_new();
-   ewl_view_widget_fetch_set(view, list_view_new);
-   ewl_view_header_fetch_set(view, list_header_fetch);
-   ewl_tree2_column_append(EWL_TREE2(tree), view, FALSE);
 
return tree;
 }
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ephoto_main.c   23 Mar 2007 23:10:28 -  1.17
+++ ephoto_main.c   28 Mar 2007 17:50:49 -  1.18
@@ -141,7 +141,6 @@
 button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/get_exif.png, NULL, NULL);
 ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)-image_object), 30, 
30);
ewl_attach_tooltip_text_set(button, You do not have libexif 0.6.13);
-
 #ifdef BUILD_EXIF_SUPPORT
ewl_callback_append(button, EWL_CALLBACK_CLICKED, display_exif_dialog, 
NULL);
ewl_attach_tooltip_text_set(button, View Exif Data);
@@ -163,8 +162,6 @@

populate(NULL, NULL, Complete Library);
 
-   ewl_main();
-
return;
 }
 
@@ -235,19 +232,20 @@
ewl_model_data_fetch_set(model, album_data_fetch);
ewl_model_data_count_set(model, album_data_count);
 
+view = ewl_view_new();
+ewl_view_widget_fetch_set(view, album_view_new);
+ewl_view_header_fetch_set(view, album_header_fetch);
+
tree = ewl_tree2_new();
ewl_tree2_headers_visible_set(EWL_TREE2(tree), 0);
ewl_tree2_fixed_rows_set(EWL_TREE2(tree), 1);
+   ewl_tree2_column_count_set(EWL_TREE2(tree), 1);
ewl_mvc_model_set(EWL_MVC(tree), model);
+   ewl_mvc_view_set(EWL_MVC(tree), view);
ewl_mvc_selection_mode_set(EWL_MVC(tree), EWL_SELECTION_MODE_SINGLE);
ewl_object_fill_policy_set(EWL_OBJECT(tree), EWL_FLAG_FILL_ALL);
ewl_container_child_append(EWL_CONTAINER(c), tree);
ewl_widget_show(tree);
-
-   view = ewl_view_new();
-   ewl_view_widget_fetch_set(view, album_view_new);
-   ewl_view_header_fetch_set(view, album_header_fetch);
-   ewl_tree2_column_append(EWL_TREE2(tree), view, FALSE);
 
return tree;
 }



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-28 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h 


Log Message:
Misplaced #endif

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto.h21 Mar 2007 10:43:23 -  1.11
+++ ephoto.h28 Mar 2007 20:22:48 -  1.12
@@ -41,8 +41,6 @@
 char *sgettext(const char *msgid);
 #define S_(str) sgettext(str)
 
-#endif
-
 /* Ephoto Main gui callbacks */
 void create_main_gui(void);
 
@@ -133,3 +131,4 @@
 
 extern Ephoto_Main *em;
 
+#endif



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-28 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_edit_view.c ephoto_exif.c ephoto_list_view.c 
ephoto_main.c ephoto_normal_view.c 


Log Message:
Tone things down a bit. Clicking a image in normal view or list view now
lets you view that image in the single view. Exif has been temporarily
moved.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto.h28 Mar 2007 20:22:48 -  1.12
+++ ephoto.h29 Mar 2007 00:24:16 -  1.13
@@ -88,7 +88,7 @@
 
 /* Ephoto Normal View */
 Ewl_Widget *add_normal_view(Ewl_Widget *c);
-void set_info(Ewl_Widget *w, void *event, void *data);
+void freebox_image_clicked(Ewl_Widget *w, void *event, void *data);
 
 /* Ephoto Slideshow */
 void start_slideshow(Ewl_Widget *w, void *event, void *data);
@@ -110,16 +110,12 @@
 {
Ecore_List *albums;
Ecore_List *images;
-   Ewl_Widget *atree; 
-   Ewl_Widget *currenta;
-   Ewl_Widget *currentf;
-   Ewl_Widget *currentl;
+   Ewl_Widget *atree;
Ewl_Widget *edit_tools;
Ewl_Widget *edit_vbox;
Ewl_Widget *eimage;
Ewl_Widget *fbox_vbox;
Ewl_Widget *fbox;
-   Ewl_Widget *ilabel;
Ewl_Widget *list_vbox;
Ewl_Widget *ltree;
Ewl_Widget *tbar;
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ephoto_edit_view.c  11 Mar 2007 01:14:47 -  1.8
+++ ephoto_edit_view.c  29 Mar 2007 00:24:16 -  1.9
@@ -27,15 +27,29 @@
 /*Show the edit view*/
 void show_edit_view(Ewl_Widget *w, void *event, void *data)
 {
+   char *path = data;
+
 ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-view_box), 
em-edit_vbox);
-   ecore_dlist_goto_first(em-images);
-ewl_widget_hide(em-ilabel);
+   if (path) 
+   {
+   ewl_image_file_path_set(EWL_IMAGE(em-eimage), path);
+   free(path);
+   }
+   else ewl_image_file_path_set(EWL_IMAGE(em-eimage), 
ecore_dlist_current(em-images));
 }
 
 /*Add edit tools to container c*/
 void add_edit_tools(Ewl_Widget *c)
 {
Ewl_Widget *image, *sep;
+
+image = add_image(c, PACKAGE_DATA_DIR /images/get_exif.png, 0, NULL, 
NULL);
+ewl_image_constrain_set(EWL_IMAGE(image), 30);
+ewl_attach_tooltip_text_set(image, You do not have libexif 0.6.13);
+#ifdef BUILD_EXIF_SUPPORT
+ewl_callback_append(image, EWL_CALLBACK_CLICKED, display_exif_dialog, 
NULL);
+ewl_attach_tooltip_text_set(image, View Exif Data);
+#endif
 
image = add_image(c, PACKAGE_DATA_DIR /images/undo.png, 0, 
rotate_image_left, NULL);
ewl_image_constrain_set(EWL_IMAGE(image), 30);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_exif.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto_exif.c   16 Mar 2007 04:34:22 -  1.12
+++ ephoto_exif.c   29 Mar 2007 00:24:16 -  1.13
@@ -59,18 +59,7 @@
 {
const char *img = NULL;
 
-if (VISIBLE(em-fbox_vbox)  em-currentf)
-{
-img = ewl_widget_name_get(em-currentf);
-}
-else if (VISIBLE(em-list_vbox)  em-currentl)
-{
-img = ewl_widget_name_get(em-currentl);
-}
-else if (VISIBLE(em-edit_vbox))
-{
-img = ewl_image_file_path_get(EWL_IMAGE(em-eimage));
-}
+if (VISIBLE(em-edit_vbox)) img = 
ewl_image_file_path_get(EWL_IMAGE(em-eimage));
if(!img) return NULL;
return strdup(img);
 }
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_list_view.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ephoto_list_view.c  28 Mar 2007 17:50:49 -  1.14
+++ ephoto_list_view.c  29 Mar 2007 00:24:16 -  1.15
@@ -4,7 +4,6 @@
 static Ewl_Widget *list_header_fetch(void *data, int column);
 static void *list_data_fetch(void *data, unsigned int row, unsigned int 
column);
 static int list_data_count(void *data);
-static void set_active_list_view(Ewl_Widget *w, void *event, void *data);
 
 /*Add the list view*/
 Ewl_Widget *add_list_view(Ewl_Widget *c)
@@ -24,20 +23,6 @@
 void show_list_view(Ewl_Widget *w, void *event, void *data)
 {
 ewl_notebook_visible_page_set(EWL_NOTEBOOK(em-view_box), 
em-list_vbox);
-ewl_mvc_dirty_set(EWL_MVC(em-ltree), 1);
-   ewl_widget_hide(em-ilabel);
-}
-
-static void set_active_list_view(Ewl_Widget *w, void *event, void *data)
-{
-   if (em-currentl)
-   {
-

E CVS: apps/ephoto titan

2007-03-28 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto


Modified Files:
Makefile.am main.edc 


Log Message:
Tone things down a bit. Clicking a image in normal view or list view now
lets you view that image in the single view. Exif has been temporarily
moved.

===
RCS file: /cvs/e/e17/apps/ephoto/data/themes/ephoto/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 23 Mar 2007 23:50:51 -  1.2
+++ Makefile.am 29 Mar 2007 00:24:16 -  1.3
@@ -18,7 +18,6 @@
bits/label.edc \
bits/scrollbar.edc \
bits/scrollpane.edc \
-   bits/select.edc \
bits/spacer.edc \
bits/tree.edc \
bits/window.edc
===
RCS file: /cvs/e/e17/apps/ephoto/data/themes/ephoto/main.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- main.edc11 Mar 2007 01:14:47 -  1.4
+++ main.edc29 Mar 2007 00:24:16 -  1.5
@@ -22,7 +22,6 @@
 #include bits/scrollbar.edc
 #include bits/scrollpane.edc
 #include bits/seeker.edc
-#include bits/select.edc
 #include bits/separator.edc
 #include bits/shadow.edc
 #include bits/spacer.edc
@@ -37,7 +36,6 @@
item: /combo/button/group /ephoto/combo/button;
item: /combo/cell/group /ephoto/combo/contents;
item: /combo/popup/group /ephoto/combo/popup;
-   item: /combo/popup/vbox/cell/group /ephoto/select/highlight;
item: /entry/group /ephoto/entry;
item: /entry/cursor/group /ephoto/entry/cursor;
item: /freebox/auto/padding 16;
@@ -48,9 +46,6 @@
item: /hseeker/group /ephoto/hseeker;
item: /hseeker/hbutton/group /ephoto/hseeker/button;
item: /hseparator/group /ephoto/hseparator;
-   item: /icon/group /ephoto/select;
-   item: /image_thumbnail/group /ephoto/select;
-   item: /image/group /ephoto/select;
item: /label/group /ephoto/label;
item: /label/textpart /ephoto/label/text;
item: /notebook/pages/group /ephoto/window;



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-28 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto/bits


Modified Files:
Makefile.am tree.edc 
Removed Files:
select.edc 


Log Message:
Tone things down a bit. Clicking a image in normal view or list view now
lets you view that image in the single view. Exif has been temporarily
moved.

===
RCS file: /cvs/e/e17/apps/ephoto/data/themes/ephoto/bits/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 23 Mar 2007 23:50:51 -  1.2
+++ Makefile.am 29 Mar 2007 00:24:16 -  1.3
@@ -6,7 +6,6 @@
 label.edc \
 scrollbar.edc \
 scrollpane.edc \
-select.edc \
 spacer.edc \
 tree.edc \
 window.edc
===
RCS file: /cvs/e/e17/apps/ephoto/data/themes/ephoto/bits/tree.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- tree.edc15 Feb 2007 10:20:19 -  1.1
+++ tree.edc29 Mar 2007 00:24:16 -  1.2
@@ -22,6 +22,23 @@
color: 255 255 255 255;
}
}
+   part
+   {
+   name: highlight;
+   type: RECT;
+   description
+   {
+   state: default 0.0;
+   visible: 0;
+   color: 71 135 195 255;
+   }
+   description
+   {
+   state: selected 0.0;
+   inherit: default 0.0;
+   visible: 1;
+   }
+   }
}
programs
{
@@ -41,5 +58,21 @@
 action: STATE_SET odd 0.0;
 target: background;
 }
+   program
+   {
+   name: selected;
+   signal: tree-selected;
+   source: *;
+   action: STATE_SET selected 0.0;
+   target: highlight;
+   }
+   program
+   {
+   name: unselected;
+   signal: tree-deselect;
+   source: *;
+   action: STATE_SET default 0.0;
+   target: highlight;
+   }
}
 }  



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_list_view.c ephoto_main.c 


Log Message:
Update ephoto to the api breakage for ewl mvc widgets.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_list_view.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto_list_view.c  21 Mar 2007 10:40:27 -  1.12
+++ ephoto_list_view.c  23 Mar 2007 23:10:28 -  1.13
@@ -1,7 +1,6 @@
 #include ephoto.h
 
-static Ewl_Widget *list_view_new(void);
-static void list_view_assign(Ewl_Widget *w, void *data);
+static Ewl_Widget *list_view_new(void *data, int column, int row);
 static Ewl_Widget *list_header_fetch(void *data, int column);
 static void *list_data_fetch(void *data, unsigned int row, unsigned int 
column);
 static int list_data_count(void *data);
@@ -61,8 +60,7 @@
ewl_widget_show(tree);
 
view = ewl_view_new();
-   ewl_view_constructor_set(view, list_view_new);
-   ewl_view_assign_set(view, list_view_assign);
+   ewl_view_widget_fetch_set(view, list_view_new);
ewl_view_header_fetch_set(view, list_header_fetch);
ewl_tree2_column_append(EWL_TREE2(tree), view, FALSE);
 
@@ -71,48 +69,37 @@
 
 
 /* The view of the images */
-static Ewl_Widget *list_view_new(void)
+static Ewl_Widget *list_view_new(void *data, int row, int column)
 {
-   Ewl_Widget *hbox;
+   const char *image;
+   char info[PATH_MAX];
+   int size, width, height;
+   Ewl_Widget *hbox, *img, *text;
+
+image = data;
+image_pixels_int_get(image, width, height);
+size = ecore_file_size(image);
+snprintf(info, PATH_MAX, Name: %s\nPixels: %s\nSize: %s\n,
+ basename((char *)image),
+ 
image_pixels_string_get(image),
+ file_size_get(size));
 
hbox = ewl_hbox_new();
ewl_box_spacing_set(EWL_BOX(hbox), 10);
ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_HFILL);
ewl_callback_append(hbox, EWL_CALLBACK_CLICKED, set_active_list_view, 
NULL);
+   ewl_widget_name_set(hbox, image);
ewl_widget_show(hbox);
 
+img = add_image(hbox, image, 1, NULL, NULL);
+ewl_image_constrain_set(EWL_IMAGE(img), 64);
+
+text = add_text(hbox, info);
+ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
+ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_LEFT);
+
return hbox;
 }
-
-/*The row that is added to the tree*/
-static void list_view_assign(Ewl_Widget *w, void *data)
-{
-   const char *image;
-   char info[PATH_MAX];
-   int size;
-   int width, height;
-   Ewl_Widget *img, *text;
-
-   image = data;
-   image_pixels_int_get(image, width, height);
-   
-   img = add_image(w, image, 1, NULL, NULL);
-   ewl_image_constrain_set(EWL_IMAGE(img), 64);
-   ewl_widget_name_set(w, image);
-   
-   size = ecore_file_size(image);
-
-   snprintf(info, PATH_MAX, Name: %s\nPixels: %s\nSize: %s\n,
-basename((char *)image), 
-image_pixels_string_get(image),
-file_size_get(size));
-   
-   text = add_text(w, info);
-   ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
-   ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_LEFT);
-   
-   return;
-}  
 
 /* The header for the tree */
 static Ewl_Widget *list_header_fetch(void *data, int column)
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ephoto_main.c   21 Mar 2007 10:43:23 -  1.16
+++ ephoto_main.c   23 Mar 2007 23:10:28 -  1.17
@@ -9,8 +9,7 @@
 static Ewl_Widget *add_atree(Ewl_Widget *c);
 
 /*Ephoto MVC Callbacks*/
-static Ewl_Widget *album_view_new(void);
-static void album_view_assign(Ewl_Widget *w, void *data);
+static Ewl_Widget *album_view_new(void *data, int column, int row);
 static Ewl_Widget *album_header_fetch(void *data, int column);
 static void *album_data_fetch(void *data, unsigned int row, unsigned int 
column);
 static int album_data_count(void *data);
@@ -246,8 +245,7 @@
ewl_widget_show(tree);
 
view = ewl_view_new();
-   ewl_view_constructor_set(view, album_view_new);
-   ewl_view_assign_set(view, album_view_assign);
+   ewl_view_widget_fetch_set(view, album_view_new);
ewl_view_header_fetch_set(view, album_header_fetch);
ewl_tree2_column_append(EWL_TREE2(tree), view, FALSE);
 
@@ -256,34

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
Makefile.am 


Log Message:
Make my make maintainer-clean work better.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 23 Mar 2007 02:06:31 -  1.6
+++ Makefile.am 23 Mar 2007 23:50:51 -  1.7
@@ -1,5 +1,8 @@
 ## Process this file with automake to produce Makefile.in 
 
+MAINTAINERCLEANFILES = *.o ephoto config.h.in config.h Makefile.in Makefile \
+  stamp-h1
+
 bin_PROGRAMS = ephoto
 
 ephoto_SOURCES = ephoto.c \



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/images


Modified Files:
Makefile.am 


Log Message:
Make my make maintainer-clean work better.

===
RCS file: /cvs/e/e17/apps/ephoto/data/images/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 18 Feb 2007 01:02:42 -  1.2
+++ Makefile.am 23 Mar 2007 23:50:50 -  1.3
@@ -1,4 +1,4 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in Makefile
 
 FILES = add.png \
camera-photo.png \



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data


Modified Files:
Makefile.am 


Log Message:
Make my make maintainer-clean work better.

===
RCS file: /cvs/e/e17/apps/ephoto/data/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 15 Feb 2007 10:20:18 -  1.1
+++ Makefile.am 23 Mar 2007 23:50:50 -  1.2
@@ -1,3 +1,3 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in Makefile
 
 SUBDIRS = images themes



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto


Modified Files:
Makefile.am 


Log Message:
Make my make maintainer-clean work better.

===
RCS file: /cvs/e/e17/apps/ephoto/data/themes/ephoto/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 15 Feb 2007 10:20:19 -  1.1
+++ Makefile.am 23 Mar 2007 23:50:51 -  1.2
@@ -1,4 +1,5 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in Makefile
+
 SUBDIRS = bits fonts images
 
 EDJE_FLAGS = \



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto/fonts


Modified Files:
Makefile.am 


Log Message:
Make my make maintainer-clean work better.

===
RCS file: /cvs/e/e17/apps/ephoto/data/themes/ephoto/fonts/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 15 Feb 2007 10:20:20 -  1.1
+++ Makefile.am 23 Mar 2007 23:50:51 -  1.2
@@ -1,4 +1,4 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in Makefile
 
 EXTRA_DIST = \
 AUTHORS \



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto/images


Modified Files:
Makefile.am 


Log Message:
Make my make maintainer-clean work better.

===
RCS file: /cvs/e/e17/apps/ephoto/data/themes/ephoto/images/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 15 Feb 2007 10:20:20 -  1.1
+++ Makefile.am 23 Mar 2007 23:50:51 -  1.2
@@ -1,4 +1,4 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in Makefile
 
 EXTRA_DIST = \
 button_clicked.png \



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto


Modified Files:
Makefile.am 


Log Message:
Make my make maintainer-clean work better.

===
RCS file: /cvs/e/e17/apps/ephoto/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 15 Feb 2007 10:20:18 -  1.1
+++ Makefile.am 23 Mar 2007 23:50:50 -  1.2
@@ -1,5 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 
+MAINTAINERCLEANFILES = Makefile.in Makefile aclocal.m4 config.* \
+   configure compile depcomp install-sh \
+   ltconfig ltmain.sh missing mkinstalldirs \
+   stamp-h.in debian/changelog
+
 SUBDIRS = src data po
 
 EXTRA_DIST = \
@@ -10,13 +15,6 @@
 debian/control \
 debian/copyright \
debian/rules
-
-
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
-   config.h.in config.sub configure install-sh \
-  ltconfig ltmain.sh missing mkinstalldirs \
-  stamp-h.in  ephoto.spec \
-  debian/changelog
 
 dist-hook:
if test -d data; then \



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src


Modified Files:
Makefile.am 


Log Message:
Make my make maintainer-clean work better.

===
RCS file: /cvs/e/e17/apps/ephoto/src/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 15 Feb 2007 10:20:21 -  1.1
+++ Makefile.am 23 Mar 2007 23:50:51 -  1.2
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in 
 
-SUBDIRS = bin
+MAINTAINERCLEANFILES = Makefile.in Makefile
 
+SUBDIRS = bin



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes/ephoto/bits


Modified Files:
Makefile.am 


Log Message:
Make my make maintainer-clean work better.

===
RCS file: /cvs/e/e17/apps/ephoto/data/themes/ephoto/bits/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 15 Feb 2007 10:20:19 -  1.1
+++ Makefile.am 23 Mar 2007 23:50:51 -  1.2
@@ -1,4 +1,4 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in Makefile
 
 EXTRA_DIST = \
 button.edc \



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-23 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/data/themes


Modified Files:
Makefile.am 


Log Message:
Make my make maintainer-clean work better.

===
RCS file: /cvs/e/e17/apps/ephoto/data/themes/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 15 Feb 2007 10:20:19 -  1.1
+++ Makefile.am 23 Mar 2007 23:50:51 -  1.2
@@ -1,3 +1,3 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in Makefile
 
 SUBDIRS = ephoto



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-22 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
Makefile.am 


Log Message:
Update ephoto to tilman's pkg-config changes.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 16 Mar 2007 06:01:44 -  1.5
+++ Makefile.am 23 Mar 2007 02:06:31 -  1.6
@@ -16,9 +16,9 @@
  ephoto_slideshow.c \
  ephoto_utils.c
 
-ephoto_CFLAGS = @ewl_cflags@ @SQLITE_CFLAGS@ @EXIF_CFLAGS@ -Wall -Werror
+ephoto_CFLAGS = @EWL_CFLAGS@ @SQLITE_CFLAGS@ @EXIF_CFLAGS@ -Wall -Werror
 
-ephoto_LDADD =  @ewl_libs@ @SQLITE_LIBS@ @EXIF_LIBS@
+ephoto_LDADD =  @EWL_LIBS@ @SQLITE_LIBS@ @EXIF_LIBS@
 
 EXTRA_DIST = \
 ephoto.h



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-22 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto


Modified Files:
configure.in 


Log Message:
Update ephoto to tilman's pkg-config changes.

===
RCS file: /cvs/e/e17/apps/ephoto/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.in16 Mar 2007 05:56:00 -  1.6
+++ configure.in23 Mar 2007 02:06:30 -  1.7
@@ -73,6 +73,7 @@
],
[
   have_sqlite3=No
+  echo Sqlite3 was not found by pkg-config!;
   AC_MSG_ERROR([Ephoto needs sqlite3 to compile.])
]
 )
@@ -87,66 +88,60 @@
]
 )
 
-PROG=evas-config;
-AC_PATH_PROG(EVAS_CONFIG, $PROG, , $PATH)
-if test -z $EVAS_CONFIG ; then
-  echo $PROG  is not in your \$PATH. Please ensure it is.;
-  echo Read the manual page for you shell as to how to extend your path.;
-  AC_MSG_ERROR(Cannot find $PROG)
-fi
-evas_cflags=`$EVAS_CONFIG --cflags`
-evas_libs=`$EVAS_CONFIG --libs`
-AC_SUBST(evas_cflags)
-AC_SUBST(evas_libs)
-
-PROG=ecore-config;
-AC_PATH_PROG(ECORE_CONFIG, $PROG, , $PATH)
-if test -z $ECORE_CONFIG ; then
-  echo $PROG  is not in your \$PATH. Please ensure it is.;
-  echo Read the manual page for you shell as to how to extend your path.;
-  AC_MSG_ERROR(Cannot find $PROG)
-fi
-ecore_cflags=`$ECORE_CONFIG --cflags`
-ecore_libs=`$ECORE_CONFIG --libs`
-AC_SUBST(ecore_cflags)
-AC_SUBST(ecore_libs)
-
-PROG=ewl-config;
-AC_PATH_PROG(EWL_CONFIG, $PROG, , $PATH)
-if test -z $EWL_CONFIG ; then
-echo $PROG  is not in your \$PATH. Please ensure it is.;
-echo Read the manual page for your shell as to how to extend your path.;
-AC_MSG_ERROR(Cannot find $PROG)
-fi
-ewl_cflags=`$EWL_CONFIG --cflags`
-ewl_libs=`$EWL_CONFIG --libs`
-AC_SUBST(ewl_cflags)
-AC_SUBST(ewl_libs)
-
-PROG=edje-config;
-AC_PATH_PROG(EDJE_CONFIG, $PROG, , $PATH)
-if test -z $EDJE_CONFIG ; then
-  echo $PROG  is not in your \$PATH. Please ensure it is.;
-  echo Read the manual page for you shell as to how to extend your path.;
-  AC_MSG_ERROR(Cannot find $PROG)
-fi
-edje_cflags=`$EDJE_CONFIG --cflags`
-edje_libs=`$EDJE_CONFIG --libs`
-AC_SUBST(edje_cflags)
-AC_SUBST(edje_libs)
-
-
-PROG=epsilon-config;
-AC_PATH_PROG(EPSILON_CONFIG, $PROG, , $PATH)
-if test -z $EPSILON_CONFIG ; then
-  echo $PROG  is not in your \$PATH. Please ensure it is.;
-  echo Read the manual page for you shell as to how to extend your path.;
-  AC_MSG_ERROR(Cannot find $PROG)
-fi
-epsilon_cflags=`$EPSILON_CONFIG --cflags`
-epsilon_libs=`$EPSILON_CONFIG --libs`
-AC_SUBST(epsilon_cflags)
-AC_SUBST(epsilon_libs)
+PKG_CHECK_MODULES([EVAS], evas,
+   [
+  have_evas=Yes
+   ],
+   [
+  have_evas=No
+  echo Evas was not found by pkg-config!;
+  AC_MSG_ERROR([Ephoto needs evas to compile.])
+   ]
+)
+
+PKG_CHECK_MODULES([ECORE], ecore,
+   [
+  have_ecore=Yes
+   ],
+   [
+  have_ecore=No
+  echo Ecore was not found by pkg-config!;
+  AC_MSG_ERROR([Ephoto needs ecore to compile.])
+   ]
+)
+
+PKG_CHECK_MODULES([EDJE], edje,
+   [
+  have_edje=Yes
+   ],
+   [
+  have_edje=No
+  echo Edje was not found by pkg-config!;
+  AC_MSG_ERROR([Ephoto needs edje to compile.])
+   ]
+)
+
+PKG_CHECK_MODULES([EWL], ewl,
+   [
+  have_ewl=Yes
+   ],
+   [
+  have_ewl=No
+  echo Ewl was not found by pkg-config!;
+  AC_MSG_ERROR([Ephoto needs ewl to compile.])
+   ]
+)
+
+PKG_CHECK_MODULES([EPSILON], epsilon,
+   [
+  have_epsilon=Yes
+   ],
+   [
+  have_epsilon=No
+  echo Epsilon was not found by pkg-config!;
+  AC_MSG_ERROR([Ephoto needs epsilon to compile.])
+   ]
+)
 
 AC_OUTPUT([
 Makefile 
@@ -185,11 +180,11 @@
 echo
 echo Configuration Options Summary:
 echo
-echo   Evas : Yes
-echo   Ecore ...: Yes
-echo   Edje : Yes
-echo   Epsilon .: Yes
-echo   EWL .: Yes
+echo   Evas : $have_evas
+echo   Ecore ...: $have_ecore
+echo   Edje : $have_edje
+echo   Epsilon .: $have_epsilon
+echo   Ewl .: $have_ewl
 echo   Libexif .: $have_exif
 echo   Sqlite3 .: $have_sqlite3
 echo



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-22 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/m4


Removed Files:
ac_expand_dir.m4 ac_path_generic.m4 


Log Message:
Remove some unneeded m4 files




-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-20 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_list_view.c ephoto_main.c 


Log Message:
Update ephoto to the new api changes.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ephoto.h16 Mar 2007 04:34:22 -  1.9
+++ ephoto.h21 Mar 2007 10:40:27 -  1.10
@@ -8,10 +8,12 @@
 #include Evas.h
 #include Ewl.h
 #include fnmatch.h
+
 #ifdef BUILD_EXIF_SUPPORT
 #include libexif/exif-data.h
 #include libexif/exif-loader.h
 #endif
+
 #include libgen.h
 #include limits.h
 #include sqlite3.h
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_list_view.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto_list_view.c  13 Mar 2007 00:52:16 -  1.11
+++ ephoto_list_view.c  21 Mar 2007 10:40:27 -  1.12
@@ -49,8 +49,8 @@
Ewl_View *view;
 
model = ewl_model_new();
-   ewl_model_fetch_set(model, list_data_fetch);
-   ewl_model_count_set(model, list_data_count);
+   ewl_model_data_fetch_set(model, list_data_fetch);
+   ewl_model_data_count_set(model, list_data_count);
 
tree = ewl_tree2_new();
ewl_tree2_headers_visible_set(EWL_TREE2(tree), 0);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ephoto_main.c   16 Mar 2007 04:34:22 -  1.14
+++ ephoto_main.c   21 Mar 2007 10:40:27 -  1.15
@@ -143,6 +143,7 @@
 button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/get_exif.png, NULL, NULL);
 ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)-image_object), 30, 
30);
ewl_attach_tooltip_text_set(button, You do not have libexif 0.6.13);
+
 #ifdef BUILD_EXIF_SUPPORT
ewl_callback_append(button, EWL_CALLBACK_CLICKED, display_exif_dialog, 
NULL);
ewl_attach_tooltip_text_set(button, View Exif Data);
@@ -233,8 +234,8 @@
Ewl_View *view;
 
model = ewl_model_new();
-   ewl_model_fetch_set(model, album_data_fetch);
-   ewl_model_count_set(model, album_data_count);
+   ewl_model_data_fetch_set(model, album_data_fetch);
+   ewl_model_data_count_set(model, album_data_count);
 
tree = ewl_tree2_new();
ewl_tree2_headers_visible_set(EWL_TREE2(tree), 0);



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-20 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto.h ephoto_main.c 


Log Message:
Remove unused pointer from the structure, and it doesn't need to be freed 
anymore.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ephoto.h21 Mar 2007 10:40:27 -  1.10
+++ ephoto.h21 Mar 2007 10:43:23 -  1.11
@@ -110,7 +110,6 @@
 
 struct _Ephoto_Main
 {
-   char **views;
Ecore_List *albums;
Ecore_List *images;
Ewl_Widget *atree; 
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ephoto_main.c   21 Mar 2007 10:40:27 -  1.15
+++ ephoto_main.c   21 Mar 2007 10:43:23 -  1.16
@@ -25,7 +25,6 @@
 ewl_widget_destroy(em-win);
ecore_list_destroy(em-albums);
ecore_list_destroy(em-images);
-   free(em-views);
free(em);
ewl_main_quit();
return;



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
config.h.in ephoto.h ephoto_exif.c ephoto_main.c 


Log Message:
Make libexif an optional requirement now. You do not have to have it to use 
ephoto.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- config.h.in 15 Feb 2007 19:13:48 -  1.2
+++ config.h.in 16 Mar 2007 04:34:22 -  1.3
@@ -1,5 +1,8 @@
 /* src/bin/config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Enable Exif Support */
+#undef BUILD_EXIF_SUPPORT
+
 /* Define to 1 if translation of program messages to the user's native
language is requested. */
 #undef ENABLE_NLS
@@ -19,9 +22,6 @@
 
 /* Define to 1 if you have the inttypes.h header file. */
 #undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the libexif/exif-data.h header file. */
-#undef HAVE_LIBEXIF_EXIF_DATA_H
 
 /* Define to 1 if you have the memory.h header file. */
 #undef HAVE_MEMORY_H
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ephoto.h13 Mar 2007 07:35:09 -  1.8
+++ ephoto.h16 Mar 2007 04:34:22 -  1.9
@@ -8,8 +8,10 @@
 #include Evas.h
 #include Ewl.h
 #include fnmatch.h
+#ifdef BUILD_EXIF_SUPPORT
 #include libexif/exif-data.h
 #include libexif/exif-loader.h
+#endif
 #include libgen.h
 #include limits.h
 #include sqlite3.h
@@ -47,8 +49,10 @@
 Ecore_List *get_images(const char *directory);
 
 /* Ephoto Exif */
+#ifdef BUILD_EXIF_SUPPORT
 Ecore_Hash *get_exif_data(const char *file);
 void display_exif_dialog(Ewl_Widget *w, void *event, void *data);
+#endif
 
 /* Ephoto Databasing */
 sqlite3 *ephoto_db_init(void);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_exif.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto_exif.c   11 Mar 2007 14:13:11 -  1.11
+++ ephoto_exif.c   16 Mar 2007 04:34:22 -  1.12
@@ -1,5 +1,6 @@
 #include ephoto.h 
 
+#ifdef BUILD_EXIF_SUPPORT
 static const char *get_image(void);
 static void close_dialog(Ewl_Widget *w, void *event, void *data);
 static void add_exif_to_container(Ewl_Widget *w, void *event, void *data);
@@ -186,4 +187,4 @@

return;
 }
-
+#endif
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto_main.c   13 Mar 2007 07:35:09 -  1.13
+++ ephoto_main.c   16 Mar 2007 04:34:22 -  1.14
@@ -116,7 +116,7 @@
ewl_container_child_append(EWL_CONTAINER(vbox), hsep);
ewl_widget_show(hsep);
 
-   em-toolbar = ewl_toolbar_new();
+   em-toolbar = ewl_htoolbar_new();
ewl_box_spacing_set(EWL_BOX(em-toolbar), 5);
ewl_object_minimum_h_set(EWL_OBJECT(em-toolbar), 30);
ewl_object_alignment_set(EWL_OBJECT(em-toolbar), 
EWL_FLAG_ALIGN_CENTER);
@@ -140,10 +140,15 @@
ewl_container_child_append(EWL_CONTAINER(em-toolbar), vsep);
ewl_widget_show(vsep);
 
-button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/get_exif.png, display_exif_dialog, NULL);
+button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/get_exif.png, NULL, NULL);
 ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)-image_object), 30, 
30);
+   ewl_attach_tooltip_text_set(button, You do not have libexif 0.6.13);
+#ifdef BUILD_EXIF_SUPPORT
+   ewl_callback_append(button, EWL_CALLBACK_CLICKED, display_exif_dialog, 
NULL);
ewl_attach_tooltip_text_set(button, View Exif Data);
-button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/stock_fullscreen.png, window_fullscreen, NULL);
+#endif
+
+   button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/stock_fullscreen.png, window_fullscreen, NULL);
 ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)-image_object), 30, 
30);
ewl_attach_tooltip_text_set(button, Toggle Fullscreen);
 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/po


Modified Files:
ephoto.pot 


Log Message:
Make libexif an optional requirement now. You do not have to have it to use 
ephoto.

===
RCS file: /cvs/e/e17/apps/ephoto/po/ephoto.pot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ephoto.pot  15 Feb 2007 19:13:48 -  1.2
+++ ephoto.pot  16 Mar 2007 04:34:22 -  1.3
@@ -7,7 +7,7 @@
 msgstr 
 Project-Id-Version: PACKAGE VERSION\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2007-02-15 07:12-0600\n
+POT-Creation-Date: 2007-03-15 17:29-0500\n
 PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n
 Last-Translator: FULL NAME [EMAIL PROTECTED]\n
 Language-Team: LANGUAGE [EMAIL PROTECTED]\n
@@ -15,22 +15,22 @@
 Content-Type: text/plain; charset=CHARSET\n
 Content-Transfer-Encoding: 8bit\n
 
-#: src/bin/ephoto_utils.c:43
+#: src/bin/ephoto_utils.c:9
 #, c-format
 msgid %'.0f Bytes
 msgstr 
 
-#: src/bin/ephoto_utils.c:47
+#: src/bin/ephoto_utils.c:13
 #, c-format
 msgid %'.0f KB
 msgstr 
 
-#: src/bin/ephoto_utils.c:51
+#: src/bin/ephoto_utils.c:17
 #, c-format
 msgid %'.0f MB
 msgstr 
 
-#: src/bin/ephoto_utils.c:55
+#: src/bin/ephoto_utils.c:21
 #, c-format
 msgid %'.1f GB
 msgstr 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto


Modified Files:
configure.in 


Log Message:
Make libexif an optional requirement now. You do not have to have it to use 
ephoto.

===
RCS file: /cvs/e/e17/apps/ephoto/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- configure.in18 Feb 2007 02:38:28 -  1.3
+++ configure.in16 Mar 2007 04:34:22 -  1.4
@@ -73,11 +73,19 @@
 )
 AC_SUBST(SQLITE_LIBS)
 
-AC_CHECK_HEADERS(libexif/exif-data.h,  
- EXIF_LIBS=$EXIF_LIBS -lexif,
- AC_MSG_ERROR([Ephoto needs libexif to compile.])
- )
-AC_SUBST(EXIF_LIBS)
+if pkg-config --exists 'sqlite3 = 3.3'; then
+   have_sqlite3=Yes
+else
+   have_sqlite3=No
+   AC_MSG_ERROR([Ephoto needs sqlite3 to compile.])
+fi
+
+if pkg-config --exists 'libexif = 0.6.13'; then
+   have_exif=Yes
+   AC_DEFINE(BUILD_EXIF_SUPPORT, 1, [Enable Exif Support])
+else 
+   have_exif=No
+fi
 
 PROG=evas-config;
 AC_PATH_PROG(EVAS_CONFIG, $PROG, , $PATH)
@@ -182,8 +190,8 @@
 echo   Edje : Yes
 echo   Epsilon .: Yes
 echo   EWL .: Yes
-echo   Libexif .: Yes
-echo   Sqlite3 .: Yes
+echo   Libexif .: $have_exif
+echo   Sqlite3 .: $have_sqlite3
 echo
 echo Installation Path.: $prefix
 echo



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/po


Modified Files:
ephoto.pot 


Log Message:
Remove version restriction on sqlite3 because I am not sure which versions work.

===
RCS file: /cvs/e/e17/apps/ephoto/po/ephoto.pot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto.pot  16 Mar 2007 04:34:22 -  1.3
+++ ephoto.pot  16 Mar 2007 04:40:05 -  1.4
@@ -7,7 +7,7 @@
 msgstr 
 Project-Id-Version: PACKAGE VERSION\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2007-03-15 17:29-0500\n
+POT-Creation-Date: 2007-03-15 17:39-0500\n
 PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n
 Last-Translator: FULL NAME [EMAIL PROTECTED]\n
 Language-Team: LANGUAGE [EMAIL PROTECTED]\n



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto


Modified Files:
configure.in 


Log Message:
Remove version restriction on sqlite3 because I am not sure which versions work.

===
RCS file: /cvs/e/e17/apps/ephoto/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- configure.in16 Mar 2007 04:34:22 -  1.4
+++ configure.in16 Mar 2007 04:40:05 -  1.5
@@ -73,7 +73,7 @@
 )
 AC_SUBST(SQLITE_LIBS)
 
-if pkg-config --exists 'sqlite3 = 3.3'; then
+if pkg-config --exists sqlite3; then
have_sqlite3=Yes
 else
have_sqlite3=No



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/po


Removed Files:
ephoto.pot 


Log Message:
This doesn't need to be in cvs.




-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
Makefile.am config.h.in 


Log Message:
Rework some of the autofoo that goes along with making exif optional.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 13 Mar 2007 07:35:09 -  1.3
+++ Makefile.am 16 Mar 2007 05:56:00 -  1.4
@@ -18,7 +18,7 @@
 
 ephoto_CFLAGS = @ewl_cflags@ -Wall -Werror
 
-ephoto_LDADD =  @ewl_libs@ -lsqlite3 -lexif
+ephoto_LDADD =  @ewl_libs@ @SQLITE_LIBS@ @EXIF_LIBS@
 
 EXTRA_DIST = \
 ephoto.h
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/config.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- config.h.in 16 Mar 2007 04:34:22 -  1.3
+++ config.h.in 16 Mar 2007 05:56:00 -  1.4
@@ -26,9 +26,6 @@
 /* Define to 1 if you have the memory.h header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the sqlite3.h header file. */
-#undef HAVE_SQLITE3_H
-
 /* Define to 1 if you have the stdint.h header file. */
 #undef HAVE_STDINT_H
 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto


Modified Files:
configure.in 


Log Message:
Rework some of the autofoo that goes along with making exif optional.

===
RCS file: /cvs/e/e17/apps/ephoto/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- configure.in16 Mar 2007 04:40:05 -  1.5
+++ configure.in16 Mar 2007 05:56:00 -  1.6
@@ -67,25 +67,25 @@
 packagesrcdir=`cd $srcdir  pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, ${packagesrcdir}, [Source code 
directory])
 
-AC_CHECK_HEADERS(sqlite3.h,
-SQLITE_LIBS=$SQLITE_LIBS -lsqlite3,
-AC_MSG_ERROR([Ephoto needs sqlite3 to compile.])
-)
-AC_SUBST(SQLITE_LIBS)
+PKG_CHECK_MODULES([SQLITE], sqlite3,
+   [
+  have_sqlite3=Yes
+   ],
+   [
+  have_sqlite3=No
+  AC_MSG_ERROR([Ephoto needs sqlite3 to compile.])
+   ]
+)
 
-if pkg-config --exists sqlite3; then
-   have_sqlite3=Yes
-else
-   have_sqlite3=No
-   AC_MSG_ERROR([Ephoto needs sqlite3 to compile.])
-fi
-
-if pkg-config --exists 'libexif = 0.6.13'; then
-   have_exif=Yes
-   AC_DEFINE(BUILD_EXIF_SUPPORT, 1, [Enable Exif Support])
-else 
-   have_exif=No
-fi
+PKG_CHECK_MODULES([EXIF], libexif = 0.6.13,
+   [
+  have_exif=Yes
+  AC_DEFINE(BUILD_EXIF_SUPPORT, 1, [Enable Exif Support])
+   ],
+   [
+  have_exif=No
+   ]
+)
 
 PROG=evas-config;
 AC_PATH_PROG(EVAS_CONFIG, $PROG, , $PATH)



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
Makefile.am 


Log Message:
Add cflags.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 16 Mar 2007 05:56:00 -  1.4
+++ Makefile.am 16 Mar 2007 06:01:44 -  1.5
@@ -16,7 +16,7 @@
  ephoto_slideshow.c \
  ephoto_utils.c
 
-ephoto_CFLAGS = @ewl_cflags@ -Wall -Werror
+ephoto_CFLAGS = @ewl_cflags@ @SQLITE_CFLAGS@ @EXIF_CFLAGS@ -Wall -Werror
 
 ephoto_LDADD =  @ewl_libs@ @SQLITE_LIBS@ @EXIF_LIBS@
 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-15 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Removed Files:
config.h.in 


Log Message:
This file shouldn't be in cvs.




-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

1 2 >

1 - 100 of 163 matches

Mail list logo