Enlightenment CVS committal Author : titan Project : e17 Module : proto
Dir : e17/proto/ephoto/src Modified Files: ephoto.c ephoto.h ephoto_callbacks.c Log Message: Update ephoto. =================================================================== RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -3 -r1.64 -r1.65 --- ephoto.c 21 Jul 2006 07:02:45 -0000 1.64 +++ ephoto.c 22 Jul 2006 07:50:27 -0000 1.65 @@ -1,5 +1,7 @@ #include "ephoto.h" Main *m = NULL; +const char *current_album; +const char *current_slideshow; int main(int argc, char **argv) @@ -9,6 +11,8 @@ char ephoto_path[PATH_MAX]; char database[PATH_MAX]; int argint = 1; + int rc = SQLITE_OK; + int i = 0; Ecore_List *files; sqlite3 *db; @@ -37,21 +41,24 @@ if (!ecore_file_exists(database)) { sqlite3_open(database, &db); - sqlite3_exec(db, "CREATE TABLE albums(id INTEGER PRIMARY KEY AUTOINCREMENT," + sqlite3_exec(db, "CREATE TABLE images(id INTEGER PRIRMARY KEY AUTOINCREMENT," "name VARCHAR(255));", NULL, NULL, NULL); - sqlite3_exec(db, "CREATE TABLE a_images(id INTEGER PRIMARY KEY AUTOINCREMENT," + sqlite3_exec(db, "CREATE TABLE albums(id INTEGER PRIMARY KEY AUTOINCREMENT," "name VARCHAR(255));", NULL, NULL, NULL); sqlite3_exec(db, "CREATE TABLE albums_full(id INTEGER PRIMARY KEY AUTOINCREMENT," "album_id INTEGER, image_id INTEGER);", NULL, NULL, NULL); sqlite3_exec(db, "CREATE TABLE slideshows(id INTEGER PRIMARY KEY AUTOINCREMENT," "name VARCHAR(255));", NULL, NULL, NULL); - sqlite3_exec(db, "CREATE TABLE s_images(id INTEGER PRIMARY KEY AUTOINCREMENT," - "name VARCHAR(255));", NULL, NULL, NULL); sqlite3_exec(db, "CREATE TABLE slideshows_images_full(id INTEGER PRIMARY KEY AUTOINCREMENT," - "slideshows_id INTEGER, images_id INTEGER);", NULL, 0, 0); - sqlite3_exec(db, "CREATE TABLE s_settings(id INTEGER PRIMARY KEY AUTOINCREMENT," + "slideshows_id INTEGER, images_id INTEGER);", NULL, NULL, NULL); + sqlite3_exec(db, "CREATE TABLE settings(id INTEGER PRIMARY KEY AUTOINCREMENT," "name VARCHAR(255));", NULL, NULL, NULL); - sqlite3_exec(db, "CREATE TABLE slideshows_settings_full(id INTEGER PRIMARY KEY AUTOINCREMENT," "slideshows_id INTEGER, settings_id INTEGER);", NULL, NULL, NULL); + sqlite3_exec(db, "CREATE TABLE slideshows_settings_full(id INTEGER PRIMARY KEY AUTOINCREMENT," + "slideshows_id INTEGER, settings_id INTEGER);", NULL, NULL, NULL); + sqlite3_exec(db, "INSERT OR IGNORE INTO albums (name) VALUES ('Complete Library');", + NULL, NULL, NULL); + sqlite3_exec(db, "INSERT OR IGNORE INTO slideshows (name) VALUES ('Complete Library Slideshow');", + NULL, NULL, NULL); sqlite3_close(db); } @@ -135,15 +142,16 @@ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item), EWL_FLAG_FILL_ALL); ewl_widget_show(m->menu_item); - m->paned = ewl_hpaned_new(); - ewl_object_alignment_set(EWL_OBJECT(m->paned), EWL_FLAG_ALIGN_CENTER); - ewl_container_child_append(EWL_CONTAINER(m->vbox), m->paned); - ewl_object_fill_policy_set(EWL_OBJECT(m->paned), EWL_FLAG_FILL_ALL); - ewl_widget_show(m->paned); + m->hpaned = ewl_hpaned_new(); + ewl_object_alignment_set(EWL_OBJECT(m->hpaned), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(m->vbox), m->hpaned); + ewl_object_fill_policy_set(EWL_OBJECT(m->hpaned), EWL_FLAG_FILL_ALL); + ewl_widget_show(m->hpaned); m->groups = ewl_vbox_new(); - ewl_container_child_append(EWL_CONTAINER(m->paned), m->groups); + ewl_container_child_append(EWL_CONTAINER(m->hpaned), m->groups); ewl_object_fill_policy_set(EWL_OBJECT(m->groups), EWL_FLAG_FILL_ALL); + ewl_object_size_request(EWL_OBJECT(m->groups), 30, 250); ewl_widget_show(m->groups); m->albums_border = ewl_border_new(); @@ -152,32 +160,42 @@ ewl_container_child_append(EWL_CONTAINER(m->groups), m->albums_border); ewl_object_alignment_set(EWL_OBJECT(m->albums_border), EWL_FLAG_ALIGN_CENTER); ewl_object_fill_policy_set(EWL_OBJECT(m->albums_border), EWL_FLAG_FILL_ALL); + ewl_object_size_request(EWL_OBJECT(m->albums_border), 30, 250); ewl_widget_show(m->albums_border); m->albums = ewl_scrollpane_new(); ewl_widget_state_set(EWL_WIDGET(m->albums), "nobg", EWL_STATE_PERSISTENT); ewl_container_child_append(EWL_CONTAINER(m->albums_border), m->albums); ewl_object_fill_policy_set(EWL_OBJECT(m->albums), EWL_FLAG_FILL_ALL); + ewl_box_spacing_set(EWL_BOX(EWL_SCROLLPANE(m->albums)->box), 8); ewl_widget_show(m->albums); + m->hseparator = ewl_hseparator_new(); + ewl_object_alignment_set(EWL_OBJECT(m->hseparator), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(m->groups), m->hseparator); + ewl_object_fill_policy_set(EWL_OBJECT(m->hseparator), EWL_FLAG_FILL_ALL); + ewl_widget_show(m->hseparator); + m->slideshows_border = ewl_border_new(); ewl_border_text_set(EWL_BORDER(m->slideshows_border), "Slideshows"); ewl_border_label_alignment_set(EWL_BORDER(m->slideshows_border), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(m->groups), m->slideshows_border); ewl_object_alignment_set(EWL_OBJECT(m->slideshows_border), EWL_FLAG_ALIGN_CENTER); ewl_object_fill_policy_set(EWL_OBJECT(m->slideshows_border), EWL_FLAG_FILL_ALL); + ewl_object_size_request(EWL_OBJECT(m->slideshows_border), 30, 250); ewl_widget_show(m->slideshows_border); m->slideshows = ewl_scrollpane_new(); ewl_widget_state_set(EWL_WIDGET(m->slideshows), "nobg", EWL_STATE_PERSISTENT); ewl_container_child_append(EWL_CONTAINER(m->slideshows_border), m->slideshows); ewl_object_fill_policy_set(EWL_OBJECT(m->slideshows), EWL_FLAG_FILL_ALL); + ewl_box_spacing_set(EWL_BOX(EWL_SCROLLPANE(m->slideshows)->box), 8); ewl_widget_show(m->slideshows); m->viewer_border = ewl_border_new(); ewl_border_text_set(EWL_BORDER(m->viewer_border), "Viewer"); ewl_border_label_alignment_set(EWL_BORDER(m->viewer_border), EWL_FLAG_ALIGN_CENTER); - ewl_container_child_append(EWL_CONTAINER(m->paned), m->viewer_border); + ewl_container_child_append(EWL_CONTAINER(m->hpaned), m->viewer_border); ewl_object_alignment_set(EWL_OBJECT(m->viewer_border), EWL_FLAG_ALIGN_CENTER); ewl_object_fill_policy_set(EWL_OBJECT(m->viewer_border), EWL_FLAG_FILL_ALL); ewl_widget_show(m->viewer_border); @@ -193,6 +211,15 @@ ewl_container_child_append(EWL_CONTAINER(m->viewer), m->viewer_freebox); ewl_object_fill_policy_set(EWL_OBJECT(m->viewer_freebox), EWL_FLAG_FILL_ALL); ewl_widget_show(m->viewer_freebox); + + sqlite3_open(database, &db); + rc = sqlite3_exec(db, "SELECT name FROM albums;", populate_album_cb, 0, 0); + sqlite3_close(db); + + sqlite3_open(database, &db); + rc = sqlite3_exec(db, "SELECT name FROM slideshows;", populate_slideshow_cb, 0, 0); + sqlite3_close(db); + ewl_main(); return 0; =================================================================== RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- ephoto.h 20 Jul 2006 05:27:13 -0000 1.28 +++ ephoto.h 22 Jul 2006 07:50:27 -0000 1.29 @@ -13,6 +13,8 @@ void add_slideshow_cb(Ewl_Widget *w, void *event, void *data); void album_clicked_cb(Ewl_Widget *w, void *event, void *data); void slideshow_clicked_cb(Ewl_Widget *w, void *event, void *data); +int populate_album_cb(void *NotUsed, int argc, char **argv, char **ColName); +int populate_slideshow_cb(void *NotUsed, int argc, char **argv, char **ColName); typedef struct _Main Main; @@ -25,7 +27,8 @@ Ewl_Widget *menubar; Ewl_Widget *menu; Ewl_Widget *menu_item; - Ewl_Widget *paned; + Ewl_Widget *hpaned; + Ewl_Widget *hseparator; Ewl_Widget *albums; Ewl_Widget *albums_border; Ewl_Widget *slideshows; @@ -37,5 +40,7 @@ }; extern Main *m; +extern const char *current_album; +extern const char *current_slideshow; #endif =================================================================== RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ephoto_callbacks.c 21 Jul 2006 07:02:45 -0000 1.6 +++ ephoto_callbacks.c 22 Jul 2006 07:50:27 -0000 1.7 @@ -248,6 +248,12 @@ void album_clicked_cb(Ewl_Widget *w, void *event, void *data) { + char *home; + char database[PATH_MAX]; + sqlite3 *db; + + current_album = ewl_icon_label_get(EWL_ICON(w)); + w = NULL; event = NULL; data = NULL; @@ -256,8 +262,49 @@ void slideshow_clicked_cb(Ewl_Widget *w, void *event, void *data) { + char *home; + char database[PATH_MAX]; + sqlite3 *db; + + current_slideshow = ewl_icon_label_get(EWL_ICON(w)); + w = NULL; event = NULL; data = NULL; return; } + +int populate_album_cb(void *NotUsed, int argc, char **argv, char **ColName) +{ + int i; + + for(i = 0; i < argc; i++) + { + m->icon = ewl_icon_new(); + ewl_icon_label_set(EWL_ICON(m->icon), argv[i]); + ewl_object_alignment_set(EWL_OBJECT(m->icon), EWL_FLAG_ALIGN_CENTER); + ewl_callback_append(m->icon, EWL_CALLBACK_CLICKED, album_clicked_cb, NULL); + ewl_container_child_append(EWL_CONTAINER(m->albums), m->icon); + ewl_widget_show(m->icon); + } + + return 0; +} + +int populate_slideshow_cb(void *NotUsed, int argc, char **argv, char **ColName) +{ + int i; + + for(i = 0; i < argc; i++) + { + m->icon = ewl_icon_new(); + ewl_icon_label_set(EWL_ICON(m->icon), argv[i]); + ewl_object_alignment_set(EWL_OBJECT(m->icon), EWL_FLAG_ALIGN_CENTER); + ewl_callback_append(m->icon, EWL_CALLBACK_CLICKED, slideshow_clicked_cb, NULL); + ewl_container_child_append(EWL_CONTAINER(m->slideshows), m->icon); + ewl_widget_show(m->icon); + } + + return 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.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs