Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
Makefile.am ephoto.c
Added Files:
ephoto_database.c
Log Message:
Begin the work on databasing. This adds the database file and gets ephoto to
start using it for albums.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 23 Sep 2006 02:53:37 -0000 1.6
+++ Makefile.am 24 Oct 2006 15:34:05 -0000 1.7
@@ -6,12 +6,12 @@
bin_PROGRAMS = ephoto
-ephoto_SOURCES = ephoto.c ephoto_callbacks.c ephoto_slideshow.c ephoto_viewer.c
+ephoto_SOURCES = ephoto.c ephoto_callbacks.c ephoto_slideshow.c
ephoto_viewer.c ephoto_database.c
ephoto_CFLAGS = @ewl_cflags@
ephoto_LDADD = $(INTLLIBS) \
- @ewl_libs@
+ @ewl_libs@ -lsqlite3
EXTRA_DIST = \
ephoto.h
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- ephoto.c 16 Oct 2006 12:30:33 -0000 1.91
+++ ephoto.c 24 Oct 2006 15:34:05 -0000 1.92
@@ -9,7 +9,8 @@
{
Ewl_Widget *vbox, *hbox, *border, *menubar, *menu, *menu_item;
Ewl_Widget *hseparator, *vseparator, *image, *text;
-
+ sqlite3 *db;
+
if (!ewl_init(&argc, argv))
{
printf("Unable to init ewl\n");
@@ -23,6 +24,7 @@
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
#endif
+
m = NULL;
current_thumbs = ecore_dlist_new();
current_directory = strdup(getenv("HOME"));
@@ -75,6 +77,7 @@
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
+ ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, add_album, NULL);
ewl_widget_show(menu_item);
menu_item = ewl_menu_item_new();
@@ -242,12 +245,15 @@
ewl_object_fill_policy_set(EWL_OBJECT(m->viewer_freebox), EWL_FLAG_FILL_ALL);
ewl_widget_show(m->viewer_freebox);
- ewl_callback_append(m->albums, EWL_CALLBACK_SHOW, populate_albums, NULL);
ewl_callback_append(m->browser, EWL_CALLBACK_SHOW, populate_browser,
current_directory);
ewl_widget_name_set(m->viewer, current_directory);
ewl_callback_append(m->viewer, EWL_CALLBACK_SHOW, populate_images, NULL);
+ db = ephoto_db_init();
+ ephoto_db_list_albums(db);
+ ephoto_db_close(db);
+
ewl_main();
return 0;
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
