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 -0000 1.2
+++ config.h.in 16 Mar 2007 04:34:22 -0000 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.h 13 Mar 2007 07:35:09 -0000 1.8
+++ ephoto.h 16 Mar 2007 04:34:22 -0000 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 -0000 1.11
+++ ephoto_exif.c 16 Mar 2007 04:34:22 -0000 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 -0000 1.13
+++ ephoto_main.c 16 Mar 2007 04:34:22 -0000 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.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
