E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/empower
Modified Files:
configure.in
Log Message:
Update empower to tilman's pkg-config changes.
===
RCS file: /cvs/e/e17/proto/empower/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.in15 Mar 2007 03:35:51 - 1.6
+++ configure.in23 Mar 2007 02:27:15 - 1.7
@@ -62,29 +62,23 @@
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code
directory])
-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)
+PKG_CHECK_MODULES([EVAS], evas,
+ [
+ ],
+ [
+ echo "Evas was not found by pkg-config!";
+ AC_MSG_ERROR([Empower needs evas to compile.])
+ ]
+)
+
+PKG_CHECK_MODULES([ECORE], ecore,
+ [
+ ],
+ [
+ echo "Ecore was not found by pkg-config!";
+ AC_MSG_ERROR([Empower needs ecore to compile.])
+ ]
+)
#PROG="ewl-config";
#AC_PATH_PROG(EWL_CONFIG, $PROG, "", $PATH)
@@ -110,13 +104,16 @@
[enable_ewl=$enableval ], [ enable_ewl=default])
if test "x$enable_ewl" = "xdefault" || test "x$enable_ewl" = "xyes"; then
- AC_PATH_GENERIC(ewl, 0.0.4, [enable_ewl="yes"], [enable_ewl="no"])
- if test x$enable_ewl ; then
- ewl_cflags=`$EWL_CONFIG --cflags`
- ewl_libs=`$EWL_CONFIG --libs`
- AC_SUBST(ewl_cflags)
- AC_SUBST(ewl_libs)
- fi
+PKG_CHECK_MODULES([EWL], ewl >= 0.4.0,
+ [
+ enable_ewl="Yes"
+ ],
+ [
+ enable_ewl="No"
+ echo "Ewl was not found by pkg-config!";
+ AC_MSG_ERROR([Empower needs ewl to compile.])
+ ]
+)
fi
AM_CONDITIONAL(ENABLE_EWL, test x$enable_ewl = xyes)
@@ -127,13 +124,17 @@
[enable_etk=$enableval], [enable_etk=default])
if test "x$enable_etk" = "xdefault" || test "x$enable_etk" = "xyes"; then
- AC_PATH_GENERIC(etk, 0.1.0, [enable_etk="yes"], [enable_etk="no"])
- if test x$enable_etk ; then
- etk_cflags=`$ETK_CONFIG --cflags`
- etk_libs=`$ETK_CONFIG --libs`
- AC_SUBST(etk_cflags)
- AC_SUBST(etk_libs)
- fi
+PKG_CHECK_MODULES([ETK], etk >= 0.1.0,
+ [
+ enable_etk="Yes"
+ ],
+ [
+ enable_etk="No"
+ echo "Etk was not found by pkg-config!";
+ AC_MSG_ERROR([Empower needs etk to compile.])
+ ]
+)
+
fi
AM_CONDITIONAL(ENABLE_ETK, test x$enable_etk = xyes)
@@ -149,18 +150,15 @@
#AC_DEFINE_UNQUOTED(HAVE_EWL, "${have_ewl}", [EWL])
#AC_DEFINE_UNQUOTED(HAVE_ETK, "${have_etk}", [ETK])
-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)
+PKG_CHECK_MODULES([EDJE], edje,
+ [
+ ],
+ [
+ echo "Edje was not found by pkg-config!";
+ AC_MSG_ERROR([Empower needs edje to compile.])
+ ]
+)
AC_OUTPUT([
Makefile
@@ -184,4 +182,4 @@
echo
echo " Building Seperate Binaries $build_separate"
echo
-
\ No newline at end of file
+
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/empower/src/bin/etk Modified Files: Makefile.am Log Message: Update empower to tilman's pkg-config changes. === RCS file: /cvs/e/e17/proto/empower/src/bin/etk/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 10 Mar 2007 10:06:17 - 1.3 +++ Makefile.am 23 Mar 2007 02:27:15 - 1.4 @@ -10,22 +10,22 @@ empower_etk_SOURCES = empower.c \ empower_cb_etk.c empower_gui_etk.c -empower_etk_CFLAGS = @etk_cflags@ +empower_etk_CFLAGS = @ETK_CFLAGS@ empower_etk_LDADD = $(INTLLIBS) \ - @etk_libs@ + @ETK_LIBS@ else bin_PROGRAMS = empower empower_SOURCES = empower.c \ empower_cb_etk.c empower_gui_etk.c -empower_CFLAGS = @etk_cflags@ +empower_CFLAGS = @ETK_CFLAGS@ empower_LDADD = $(INTLLIBS) \ - @etk_libs@ + @ETK_LIBS@ endif EXTRA_DIST = -MAINTAINERCLEANFILES = Makefile.in config.h.in \ No newline at end of file +MAINTAINERCLEANFILES = Makefile.in config.h.in - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/empower/src/bin/ewl Modified Files: Makefile.am Log Message: Update empower to tilman's pkg-config changes. === RCS file: /cvs/e/e17/proto/empower/src/bin/ewl/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 10 Mar 2007 10:06:17 - 1.2 +++ Makefile.am 23 Mar 2007 02:27:16 - 1.3 @@ -9,21 +9,21 @@ empower_ewl_SOURCES = empower.c empower_cb_ewl.c empower_gui_ewl.c -empower_ewl_CFLAGS = @ewl_cflags@ +empower_ewl_CFLAGS = @EWL_CFLAGS@ empower_ewl_LDADD = $(INTLLIBS) \ - @ewl_libs@ + @EWL_LIBS@ else bin_PROGRAMS = empower empower_SOURCES = empower.c empower_cb_ewl.c empower_gui_ewl.c -empower_CFLAGS = @ewl_cflags@ +empower_CFLAGS = @EWL_CFLAGS@ empower_LDADD = $(INTLLIBS) \ - @ewl_libs@ + @EWL_LIBS@ endif EXTRA_DIST = -MAINTAINERCLEANFILES = Makefile.in config.h.in \ No newline at end of file +MAINTAINERCLEANFILES = Makefile.in config.h.in - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/data/images Removed Files: .cvsignore Makefile.am add.png dialog-close.png emblem-favorite.png emblem-photos.png exit.png folder.png go-down.png go-home.png go-next.png go-up.png image.png image_bg.edc preferences-system.png redo.png remove.png search.png stock_save.png undo.png x-office-presentation.png Log Message: Remove this ephoto as it is old.. the new one will soon be added in e17/apps/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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Removed Files: .cvsignore Makefile.am config.h.in ephoto.c ephoto.h ephoto_browsing.c ephoto_database.c ephoto_gui.c ephoto_imaging.c ephoto_nls.c Log Message: Remove this ephoto as it is old.. the new one will soon be added in e17/apps/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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/data Removed Files: .cvsignore Makefile.am Log Message: Remove this ephoto as it is old.. the new one will soon be added in e17/apps/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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/m4 Removed Files: .cvsignore ac_expand_dir.m4 ac_path_generic.m4 Log Message: Remove this ephoto as it is old.. the new one will soon be added in e17/apps/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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/po Removed Files: .cvsignore Makefile.am de.po fr.po it.po sv.po Log Message: Remove this ephoto as it is old.. the new one will soon be added in e17/apps/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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/debian Removed Files: .cvsignore README.Debian changelog.in compat control copyright dirs docs rules Log Message: Remove this ephoto as it is old.. the new one will soon be added in e17/apps/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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto Removed Files: .cvsignore ABOUT-NLS AUTHORS COPYING COPYING.icons ChangeLog INSTALL Makefile.am NEWS README TODO autogen.sh configure.in ephoto.spec.in Log Message: Remove this ephoto as it is old.. the new one will soon be added in e17/apps/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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Removed Files: .cvsignore Makefile.am ephoto.c ephoto.h ephoto_callbacks.c ephoto_database.c ephoto_slideshow.c ephoto_viewer.c Log Message: Remove this ephoto as it is old.. the new one will soon be added in e17/apps/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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.c
Log Message:
Easier way to populate some images in a album for now.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ephoto.c29 Jan 2007 09:51:24 - 1.10
+++ ephoto.c30 Jan 2007 10:21:13 - 1.11
@@ -28,6 +28,9 @@
"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"
@@ -40,6 +43,7 @@
" -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"
@@ -118,6 +122,46 @@
}
else printf("Image was not added\n");
+ return 0;
+ }
+ if(!strcmp(argv[i], "--add-image-dir") || !strcmp(argv[i],
"-id"))
+ {
+i++;
+if(argv[i]) album = argv[i];
+else
+{
+printf("Please specify the album you wish to
add to\n");
+return 1;
+}
+
+i++;
+if(argv[i]) path = argv[i];
+else
+{
+printf("Please specify the path to the image
directory\n");
+return 1;
+}
+
+printf("Are you sure you want to add images "
+ "from the directory %s to the album %s? ",
+ path, album);
+scanf("%c", &input);
+if(!strncasecmp(input, "y", 1))
+{
+ db = ephoto_db_init();
+ images = ecore_list_new();
+ images = get_images(path);
+ while (!ecore_list_is_empty(images))
+ {
+ name = ecore_list_remove_first(images);
+ ephoto_db_add_image(db, album,
basename(name), name);
+ }
+ ephoto_db_close(db);
+ ecore_list_destroy(images);
+ printf("Images were added\n");
+ }
+ else printf("Images were not added\n");
+
return 0;
}
if(!strcmp(argv[i], "--list-albums") || !strcmp(argv[i], "-la"))
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.c
Log Message:
Add some more command options!
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ephoto.c28 Jan 2007 13:37:18 - 1.9
+++ ephoto.c29 Jan 2007 09:51:24 - 1.10
@@ -4,6 +4,7 @@
{
char *album, *name, *description, *path, input[2];
int i;
+ Ecore_List *albums, *images;
sqlite3 *db;
/*Check to make sure EWL is accessible*/
@@ -27,6 +28,9 @@
"arg1 = name of
album to add image to\n"
"arg2 =
descriptive name for image\n"
"arg3 = path to
the image\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"
@@ -34,10 +38,12 @@
"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"
- " -ra%%s - Removes Album\n"
- " -ri%%s %%s - Removes
Image\n");
+ " -a %%s %%s - Adds Album\n"
+ " -i %%s %%s %%s - Adds Image\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"))
@@ -112,6 +118,41 @@
}
else printf("Image was not added\n");
+ return 0;
+ }
+ if(!strcmp(argv[i], "--list-albums") || !strcmp(argv[i], "-la"))
+ {
+ db = ephoto_db_init();
+ albums = ecore_list_new();
+ albums = ephoto_db_list_albums(db);
+ ephoto_db_close(db);
+ while(!ecore_list_is_empty(albums))
+ {
+ album = ecore_list_remove_first(albums);
+ printf("%s\n", album);
+ }
+ ecore_list_destroy(albums);
+
+ return 0;
+ }
+ if(!strcmp(argv[i], "--list-images") || !strcmp(argv[i], "-li"))
+ {
+ i++;
+ if(argv[i]) album = argv[i];
+ else
+ {
+ printf("Please specify the album to list images
from\n");
+ return 1;
+ }
+
+ db = ephoto_db_init();
+ images = ephoto_db_list_images(db, album);
+ ephoto_db_close(db);
+ while(!ecore_list_is_empty(images))
+ {
+ path = ecore_list_remove_first(images);
+ printf("%s\n", path);
+ }
return 0;
}
if(!strcmp(argv[i], "--remove-album") || !strcmp(argv[i],
"-ra"))
-
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://
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Modified Files: ephoto_database.c Log Message: Fix that bugger that seg faulting on remove image! === RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_database.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ephoto_database.c 29 Jan 2007 07:52:38 - 1.5 +++ ephoto_database.c 29 Jan 2007 08:38:24 - 1.6 @@ -136,7 +136,7 @@ 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, "DELETE FROM album_images WHERE " - "image_id = '%s' AND album_id = '%s';", image_id, album_id); + "image_id = '%d' AND album_id = '%d';", image_id, album_id); sqlite3_exec(db, command, 0, 0, 0); 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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Modified Files: ephoto_gui.c Log Message: Update to tree2 changes === RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- ephoto_gui.c28 Jan 2007 13:37:18 - 1.29 +++ ephoto_gui.c29 Jan 2007 08:10:22 - 1.30 @@ -226,6 +226,7 @@ ewl_model_count_set(model, album_data_count); tree = ewl_tree2_new(); + ewl_mvc_model_set(EWL_MVC(tree), model); 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); @@ -235,8 +236,7 @@ ewl_view_constructor_set(view, album_view_new); ewl_view_assign_set(view, album_view_assign); ewl_view_header_fetch_set(view, album_header_fetch); - - ewl_tree2_column_append(EWL_TREE2(tree), model, view); + ewl_tree2_column_append(EWL_TREE2(tree), view, TRUE); 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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_database.c
Log Message:
Whoops. Make sure the directory exists, if not, create it.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_database.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ephoto_database.c 28 Jan 2007 13:37:18 - 1.4
+++ ephoto_database.c 29 Jan 2007 07:52:38 - 1.5
@@ -17,12 +17,18 @@
sqlite3 *ephoto_db_init(void)
{
char path[PATH_MAX];
+ char path2[PATH_MAX];
sqlite3 *db;
snprintf(path, PATH_MAX, "%s/.ephoto/.ephoto_database", getenv("HOME"));
+ snprintf(path2, PATH_MAX, "%s/.ephoto", getenv("HOME"));
if (!ecore_file_exists(path))
{
+ if (!ecore_file_exists(path2))
+ {
+ ecore_file_mkdir(path2);
+ }
sqlite3_open(path, &db);
sqlite3_exec(db, "CREATE TABLE 'albums'( "
"id INTEGER PRIMARY KEY AUTOINCREMENT, "
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.c ephoto_database.c ephoto_gui.c
Log Message:
Add some command line parsing for album work.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ephoto.c26 Jan 2007 05:16:54 - 1.8
+++ ephoto.c28 Jan 2007 13:37:18 - 1.9
@@ -2,12 +2,177 @@
int main(int argc, char **argv)
{
+ char *album, *name, *description, *path, input[2];
+ int i;
+ sqlite3 *db;
+
/*Check to make sure EWL is accessible*/
if (!ewl_init(&argc, argv))
{
printf("Ewl is not usable, please check your installation!\n");
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"
+ " --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"
+ " -ra%%s - Removes Album\n"
+ " -ri%%s %%s - Removes
Image\n");
+ return 0;
+ }
+ if(!strcmp(argv[i], "--add-album") || !strcmp(argv[i], "-a"))
+ {
+ i++;
+ if(argv[i]) name = argv[i];
+ else
+ {
+ printf("Please specify a name for the album\n");
+ return 1;
+ }
+
+ i++;
+ if(argv[i]) description = argv[i];
+ else
+ {
+ printf("Please specify a description for the
album\n");
+ return 1;
+ }
+
+ printf("Are you sure you want to create an album with "
+ "the name %s and the description %s? ",
+ name, description);
+ scanf("%c", &input);
+ if(!strncasecmp(input, "y", 1))
+ {
+ db = ephoto_db_init();
+ ephoto_db_add_album(db, name, description);
+ ephoto_db_close(db);
+ printf("Album was created\n");
+ }
+ else printf("Album was not created\n");
+
+ return 0;
+ }
+ if(!strcmp(argv[i], "--add-image") || !strcmp(argv[i], "-i"))
+ {
+ i++;
+ if(argv[i]) album = argv[i];
+ else
+ {
+ printf("Please specify the album you wish to
add to\n");
+ return 1;
+ }
+
+ i++;
+ if(argv[i]) name = argv[i];
+ else
+ {
+ printf("Please specify a descriptive name for
the image\n");
+ return 1;
+ }
+
+ i++
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c
Log Message:
Abstraction with dialogs.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ephoto_gui.c26 Jan 2007 09:22:50 - 1.27
+++ ephoto_gui.c27 Jan 2007 06:30:29 - 1.28
@@ -2,14 +2,19 @@
/*Ewl Callbacks*/
static void destroy(Ewl_Widget *w, void *event, void *data);
+static void close_dialog(Ewl_Widget *w, void *event, void *data);
static void populate(Ewl_Widget *w, void *event, void *data);
static void view_image(Ewl_Widget *w, void *event, void *data);
+static void about_clicked(Ewl_Widget *w, void *event, void *data);
+static void help_clicked(Ewl_Widget *w, void *event, void *data);
/*Ephoto Widget Creation Callbacks*/
-static void add_button(Ewl_Widget *c, char *txt, char *img, void *cb);
-static void add_icon(Ewl_Widget *c, char *txt, char *img, void *cb);
+static Ewl_Widget *add_button(Ewl_Widget *c, char *txt, char *img, void *cb,
void *data);
+static Ewl_Widget *add_dialog_about(Ewl_Widget *c, char *title);
+static Ewl_Widget *add_dialog_save(Ewl_Widget *c, char *title, void *cb);
+static Ewl_Widget *add_icon(Ewl_Widget *c, char *txt, char *img, void *cb);
static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt);
-static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
+static Ewl_Widget *add_menu_item(Ewl_Widget *c, char *txt, char *img, void
*cb, void *data);
static Ewl_Widget *add_tree(Ewl_Widget *c);
/*Ephoto MVC Callbacks*/
@@ -38,13 +43,23 @@
/*Destroy the Main Window*/
static void destroy(Ewl_Widget *w, void *event, void *data)
{
+ Ewl_Widget *widget;
+ widget = data;
ephoto_db_close(db);
-ewl_widget_destroy(w);
+ewl_widget_destroy(widget);
ewl_main_quit();
}
+/*Destroy the dialog*/
+static void destroy_dialog(Ewl_Widget *w, void *event, void *data)
+{
+ Ewl_Widget *widget;
+ widget = data;
+ ewl_widget_destroy(widget);
+}
+
/*Create and Add a Button to the Container c*/
-static void add_button(Ewl_Widget *c, char *txt, char *img, void *cb)
+static Ewl_Widget *add_button(Ewl_Widget *c, char *txt, char *img, void *cb,
void *data)
{
Ewl_Widget *button;
@@ -62,15 +77,78 @@
ewl_container_child_append(EWL_CONTAINER(c), button);
if (cb)
{
- ewl_callback_append(button, EWL_CALLBACK_CLICKED, cb, NULL);
+ ewl_callback_append(button, EWL_CALLBACK_CLICKED, cb, data);
}
ewl_widget_show(button);
- return;
+ return button;
+}
+
+/*Create and Show a dialog with only an option to close*/
+static Ewl_Widget *add_dialog_about(Ewl_Widget *c, char *title)
+{
+ Ewl_Widget *window, *vbox, *button;
+
+ window = ewl_window_new();
+ewl_window_title_set(EWL_WINDOW(window), title);
+ ewl_window_name_set(EWL_WINDOW(window), title);
+ ewl_window_dialog_set(EWL_WINDOW(window), 1);
+ ewl_object_size_request(EWL_OBJECT(window), 400, 200);
+ ewl_callback_append(window, EWL_CALLBACK_DELETE_WINDOW, destroy_dialog,
window);
+ ewl_widget_show(window);
+
+ vbox = ewl_vbox_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
+ ewl_container_child_append(EWL_CONTAINER(window), vbox);
+ ewl_widget_show(vbox);
+
+ if (c)
+ {
+ ewl_container_child_append(EWL_CONTAINER(vbox), c);
+ }
+
+ add_button(vbox, "Close", PACKAGE_DATA_DIR "/images/dialog-close.png",
destroy_dialog, window);
+
+ return window;
+}
+
+/*Create and add a save dialog*/
+static Ewl_Widget *add_dialog_save(Ewl_Widget *c, char *title, void *cb)
+{
+ Ewl_Widget *window, *vbox, *hbox, *button;
+
+window = ewl_window_new();
+ewl_window_title_set(EWL_WINDOW(window), title);
+ ewl_window_name_set(EWL_WINDOW(window), title);
+ ewl_window_dialog_set(EWL_WINDOW(window), 1);
+ ewl_object_size_request(EWL_OBJECT(window), 400, 200);
+ ewl_callback_append(window, EWL_CALLBACK_DELETE_WINDOW, destroy_dialog,
window);
+ ewl_widget_show(window);
+
+ vbox = ewl_vbox_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
+ ewl_container_child_append(EWL_CONTAINER(window), vbox);
+ ewl_widget_show(vbox);
+
+ if (c)
+ {
+ ewl_container_child_append(EWL_CONTAINER(vbox), c);
+ }
+
+ hbox = ewl_hbox_new();
+ ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
+ ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK);
+ ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
+ ewl_widget_show(hbox);
+
+ add_button(vbox, "Save", PACKAGE_
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.h ephoto_database.c
Log Message:
Add the final databasing touch... Removal of albums and images.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ephoto.h26 Jan 2007 08:26:57 - 1.9
+++ ephoto.h27 Jan 2007 02:28:07 - 1.10
@@ -24,8 +24,10 @@
/* Ephoto Databasing */
sqlite3 *ephoto_db_init(void);
void ephoto_db_add_album(sqlite3 *db, char *name, char *description);
+void ephoto_db_delete_album(sqlite3 *db, char *name);
Ecore_List *ephoto_db_list_albums(sqlite3 *db);
void ephoto_db_add_image(sqlite3 *db, char *album, char *name, char *path);
+void ephoto_db_delete_image(sqlite3 *db, char *album, char *path);
Ecore_List *ephoto_db_list_images(sqlite3 *db, char *album);
void ephoto_db_close(sqlite3 *db);
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_database.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ephoto_database.c 26 Jan 2007 09:22:50 - 1.2
+++ ephoto_database.c 27 Jan 2007 02:28:07 - 1.3
@@ -82,6 +82,18 @@
return;
}
+/*Deleate an album from the album table*/
+void ephoto_db_delete_album(sqlite3 *db, char *name)
+{
+ char command[PATH_MAX];
+
+ snprintf(command, PATH_MAX, "DELETE FROM albums WHERE name = '%s';",
name);
+
+ sqlite3_exec(db, command, 0, 0, 0);
+
+ return;
+}
+
/*Add a new image to a particular album*/
void ephoto_db_add_image(sqlite3 *db, char *album, char *name, char *path)
{
@@ -107,6 +119,20 @@
return;
}
+
+/*Delete an image from a particular album*/
+void ephoto_db_delete_image(sqlite3 *db, char *album, char *path)
+{
+ char command[PATH_MAX];
+
+ 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);
+ sqlite3_exec(db, command, get_image_id, 0, 0);
+ snprintf(command, PATH_MAX, "DELETE FROM album_images WHERE "
+ "album_id = '%s' AND image_id = '%s';",
album_id, image_id);
+ return;
+}
/*Populate a list the albums in the albums table*/
static int list_albums(void *notused, int argc, char **argv, char **col)
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_database.c ephoto_gui.c
Log Message:
More database work.. Fixup the gui a little bit.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_database.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto_database.c 26 Jan 2007 08:26:57 - 1.1
+++ ephoto_database.c 26 Jan 2007 09:22:50 - 1.2
@@ -13,6 +13,7 @@
/*Ephoto databasing ecore global variables*/
static Ecore_List *albums, *images, *image_ids;
+/*Open the sqlite3 database. Create the database if it does not already
exits.*/
sqlite3 *ephoto_db_init(void)
{
char path[PATH_MAX];
@@ -43,6 +44,7 @@
return db;
}
+/*Get the id of an image in the images table*/
static int get_image_id(void *notused, int argc, char **argv, char **col)
{
int i;
@@ -55,6 +57,7 @@
return 0;
}
+/*Get the id of an album in the albums table*/
static int get_album_id(void *notused, int argc, char **argv, char **col)
{
int i;
@@ -67,7 +70,7 @@
return 0;
}
-
+/*Add a new album to the album table*/
void ephoto_db_add_album(sqlite3 *db, char *name, char *description)
{
char command[PATH_MAX];
@@ -79,6 +82,7 @@
return;
}
+/*Add a new image to a particular album*/
void ephoto_db_add_image(sqlite3 *db, char *album, char *name, char *path)
{
char command[PATH_MAX];
@@ -92,10 +96,19 @@
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);
+ 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';");
+ 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);
+ sqlite3_exec(db, command, 0, 0, 0);
+
return;
}
-
+/*Populate a list the albums in the albums table*/
static int list_albums(void *notused, int argc, char **argv, char **col)
{
int i;
@@ -110,6 +123,7 @@
return 0;
}
+/*Return a list of albums in the albums table*/
Ecore_List *ephoto_db_list_albums(sqlite3 *db)
{
if(albums)
@@ -122,6 +136,7 @@
return albums;
}
+/*Populate a list of images belonging to a certain album*/
static int list_images(void *notused, int argc, char **argv, char **col)
{
int i;
@@ -136,6 +151,7 @@
return 0;
}
+/*Populate a list of the id's of images belonging to a certain album*/
static int list_image_ids(void *notused, int argc, char **argv, char **col)
{
char command[PATH_MAX];
@@ -151,6 +167,7 @@
return 0;
}
+/*Return a list of images belonging to a certain album*/
Ecore_List *ephoto_db_list_images(sqlite3 *db, char *album)
{
char command[PATH_MAX];
@@ -183,6 +200,7 @@
return images;
}
+/*Close the sqlite3 database*/
void ephoto_db_close(sqlite3 *db)
{
sqlite3_close(db);
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ephoto_gui.c26 Jan 2007 08:26:57 - 1.26
+++ ephoto_gui.c26 Jan 2007 09:22:50 - 1.27
@@ -3,7 +3,6 @@
/*Ewl Callbacks*/
static void destroy(Ewl_Widget *w, void *event, void *data);
static void populate(Ewl_Widget *w, void *event, void *data);
-static void view_catalog(Ewl_Widget *w, void *event, void *data);
static void view_image(Ewl_Widget *w, void *event, void *data);
/*Ephoto Widget Creation Callbacks*/
@@ -27,8 +26,7 @@
static void rotate_image_right(Ewl_Widget *w, void *event, void *data);
/*Ephoto Widget Global Variables*/
-static Ewl_Widget *atree, *fbox, *vnb;
-static Ewl_Widget *cvbox, *ivbox, *vimage;
+static Ewl_Widget *atree, *fbox, *vimage;
/*Ephoto Ecore Global Variables*/
static Ecore_Timer *timer;
@@ -231,12 +229,6 @@
return val;
}
-/*Switch to the Image List*/
-static void view_catalog(Ewl_Widget *w, void *event, void *data)
-{
- ewl_notebook_visible_page_set(EWL_NOTEBOOK(vnb), cvbox);
-}
-
/*Switch to the Image Viewer*/
static void view_image(Ewl_Widget *w, void *event, void *data)
{
@@ -244,7 +236,7 @@
file = data;
ewl_image_file_set(EWL_IMAGE(vimage), file, NULL);
- ewl_notebook_visible_page_set(EWL_NOTEBOOK(vnb), ivbox);
+ ewl_widget_reparent(vimage);
}
/*Update the Directory List and Image List*/
@@ -278,7 +270,7 @@
thumb = ewl_image_thumbnail_new
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
Makefile.am ephoto.h ephoto_gui.c
Added Files:
ephoto_database.c
Log Message:
Add a databaser to ephoto_test in preparation to move ephoto_test to an album
style image viewer.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 11 Jan 2007 23:14:28 - 1.3
+++ Makefile.am 26 Jan 2007 08:26:57 - 1.4
@@ -4,13 +4,14 @@
ephoto_test_SOURCES = ephoto.c \
ephoto_browsing.c \
+ ephoto_database.c \
ephoto_gui.c \
ephoto_imaging.c \
ephoto_nls.c
ephoto_test_CFLAGS = @ewl_cflags@
-ephoto_test_LDADD = @ewl_libs@
+ephoto_test_LDADD = @ewl_libs@ -lsqlite3
EXTRA_DIST = \
ephoto.h
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ephoto.h19 Jan 2007 03:20:11 - 1.8
+++ ephoto.h26 Jan 2007 08:26:57 - 1.9
@@ -8,6 +8,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -19,6 +20,14 @@
/* Ephoto Browsing */
Ecore_List *get_directories(char *directory);
Ecore_List *get_images(char *directory);
+
+/* Ephoto Databasing */
+sqlite3 *ephoto_db_init(void);
+void ephoto_db_add_album(sqlite3 *db, char *name, char *description);
+Ecore_List *ephoto_db_list_albums(sqlite3 *db);
+void ephoto_db_add_image(sqlite3 *db, char *album, char *name, char *path);
+Ecore_List *ephoto_db_list_images(sqlite3 *db, char *album);
+void ephoto_db_close(sqlite3 *db);
/* Ephoto Imaging */
unsigned int *flip_horizontal(Ewl_Widget *image);
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ephoto_gui.c26 Jan 2007 05:16:54 - 1.25
+++ ephoto_gui.c26 Jan 2007 08:26:57 - 1.26
@@ -34,12 +34,13 @@
static Ecore_Timer *timer;
static Ecore_List *albums, *images;
-/*Ephoto Current Directory*/
-static char *current_directory;
+/*Ephoto Databasing Global Variables*/
+sqlite3 *db;
/*Destroy the Main Window*/
static void destroy(Ewl_Widget *w, void *event, void *data)
{
+ ephoto_db_close(db);
ewl_widget_destroy(w);
ewl_main_quit();
}
@@ -187,7 +188,7 @@
album = data;
ewl_icon_image_set(EWL_ICON(w), PACKAGE_DATA_DIR "/images/image.png",
NULL);
- ewl_icon_label_set(EWL_ICON(w), basename(album));
+ ewl_icon_label_set(EWL_ICON(w), album);
ewl_icon_constrain_set(EWL_ICON(w), 25);
ewl_widget_name_set(w, album);
ewl_callback_append(w, EWL_CALLBACK_CLICKED, populate, NULL);
@@ -256,19 +257,18 @@
{
album = (char *)ewl_widget_name_get(w);
}
-
- if (!ecore_list_is_empty(albums))
+ else
{
- ecore_list_destroy(albums);
- albums = ecore_list_new();
+ album = data;
}
- if (!ecore_list_is_empty(images))
+
+ if (images)
{
ecore_list_destroy(images);
- images = ecore_list_new();
}
- ewl_mvc_data_set(EWL_MVC(atree), albums);
+ images = ecore_list_new();
+ images = ephoto_db_list_images(db, album);
ewl_container_reset(EWL_CONTAINER(fbox));
while (!ecore_list_is_empty(images))
@@ -413,8 +413,11 @@
ewl_widget_show(vimage);
albums = ecore_list_new();
- images = ecore_list_new();
- populate(NULL, NULL, NULL);
+ db = ephoto_db_init();
+ albums = ephoto_db_list_albums(db);
+ ewl_mvc_data_set(EWL_MVC(atree), albums);
+
+ populate(NULL, NULL, "Complete Library");
ewl_main();
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.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.c ephoto_gui.c
Log Message:
Change things around a bit.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ephoto.c19 Jan 2007 03:20:11 - 1.7
+++ ephoto.c26 Jan 2007 05:16:54 - 1.8
@@ -16,7 +16,9 @@
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
#endif
- //ewl_theme_theme_set(PACKAGE_DATA_DIR "/themes/ephoto.edj");
+ /*Use our own custom theme*/
+// ewl_theme_theme_set(PACKAGE_DATA_DIR "/themes/ephoto.edj");
+
/*Start the GUI*/
create_main_gui();
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ephoto_gui.c19 Jan 2007 06:09:53 - 1.24
+++ ephoto_gui.c26 Jan 2007 05:16:54 - 1.25
@@ -2,7 +2,7 @@
/*Ewl Callbacks*/
static void destroy(Ewl_Widget *w, void *event, void *data);
-static void populate_files(Ewl_Widget *w, void *event, void *data);
+static void populate(Ewl_Widget *w, void *event, void *data);
static void view_catalog(Ewl_Widget *w, void *event, void *data);
static void view_image(Ewl_Widget *w, void *event, void *data);
@@ -14,11 +14,11 @@
static Ewl_Widget *add_tree(Ewl_Widget *c);
/*Ephoto MVC Callbacks*/
-static Ewl_Widget *directory_view_new(void);
-static void directory_view_assign(Ewl_Widget *w, void *data);
-static Ewl_Widget *directory_header_fetch(void *data, int column);
-static void *directory_data_fetch(void *data, unsigned int row, unsigned int
column);
-static int directory_data_count(void *data);
+static Ewl_Widget *album_view_new(void);
+static void album_view_assign(Ewl_Widget *w, void *data);
+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);
/*Ephoto Image Manipulation*/
static void flip_image_horizontal(Ewl_Widget *w, void *event, void *data);
@@ -27,12 +27,12 @@
static void rotate_image_right(Ewl_Widget *w, void *event, void *data);
/*Ephoto Widget Global Variables*/
-static Ewl_Widget *ftree, *atree, *fbox, *vnb;
-static Ewl_Widget *cvbox, *ivbox, *vimage, *progress;
+static Ewl_Widget *atree, *fbox, *vnb;
+static Ewl_Widget *cvbox, *ivbox, *vimage;
/*Ephoto Ecore Global Variables*/
static Ecore_Timer *timer;
-static Ecore_List *directories, *images;
+static Ecore_List *albums, *images;
/*Ephoto Current Directory*/
static char *current_directory;
@@ -102,7 +102,7 @@
menu = ewl_menu_new();
if (txt)
{
- ewl_button_label_set(EWL_BUTTON(menu), S_(txt));
+ ewl_button_label_set(EWL_BUTTON(menu), txt);
}
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_container_child_append(EWL_CONTAINER(c), menu);
@@ -123,7 +123,7 @@
}
if (txt)
{
- ewl_button_label_set(EWL_BUTTON(menu_item), S_(txt));
+ ewl_button_label_set(EWL_BUTTON(menu_item), txt);
}
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
@@ -145,8 +145,8 @@
Ewl_View *view;
model = ewl_model_new();
- ewl_model_fetch_set(model, directory_data_fetch);
- ewl_model_count_set(model, directory_data_count);
+ ewl_model_fetch_set(model, album_data_fetch);
+ ewl_model_count_set(model, album_data_count);
tree = ewl_tree2_new();
ewl_mvc_selection_mode_set(EWL_MVC(tree), EWL_SELECTION_MODE_SINGLE);
@@ -155,9 +155,9 @@
ewl_widget_show(tree);
view = ewl_view_new();
- ewl_view_constructor_set(view, directory_view_new);
- ewl_view_assign_set(view, directory_view_assign);
- ewl_view_header_fetch_set(view, directory_header_fetch);
+ ewl_view_constructor_set(view, album_view_new);
+ ewl_view_assign_set(view, album_view_assign);
+ ewl_view_header_fetch_set(view, album_header_fetch);
ewl_tree2_column_append(EWL_TREE2(tree), model, view);
@@ -166,7 +166,7 @@
/* The view of the users directories */
-static Ewl_Widget *directory_view_new(void)
+static Ewl_Widget *album_view_new(void)
{
Ewl_Widget *icon;
@@ -181,27 +181,20 @@
}
/*The row that is added to the tree*/
-static void directory_view_assign(Ewl_Widget *w, void *data)
+static void album_view_assign(Ewl_Widget *w, void *data)
{
- char *file;
+ char *album;
- file = data;
- ewl_icon_image_set(EWL_ICON(w), PACKAGE_DATA_DIR "/images/folder
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c
Log Message:
testing some things.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ephoto_gui.c19 Jan 2007 03:22:24 - 1.23
+++ ephoto_gui.c19 Jan 2007 06:09:53 - 1.24
@@ -8,6 +8,7 @@
/*Ephoto Widget Creation Callbacks*/
static void add_button(Ewl_Widget *c, char *txt, char *img, void *cb);
+static void add_icon(Ewl_Widget *c, char *txt, char *img, void *cb);
static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt);
static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
static Ewl_Widget *add_tree(Ewl_Widget *c);
@@ -43,7 +44,7 @@
ewl_main_quit();
}
-/*Create and Add a Button the Container c*/
+/*Create and Add a Button to the Container c*/
static void add_button(Ewl_Widget *c, char *txt, char *img, void *cb)
{
Ewl_Widget *button;
@@ -69,6 +70,30 @@
return;
}
+/*Create and Add an Image to the Container c*/
+static void add_icon(Ewl_Widget *c, char *txt, char *img, void *cb)
+{
+ Ewl_Widget *icon;
+
+ icon = ewl_icon_simple_new();
+ ewl_icon_image_set(EWL_ICON(icon), img, NULL);
+ if (txt)
+ {
+ ewl_icon_label_set(EWL_ICON(icon), txt);
+ }
+ ewl_icon_constrain_set(EWL_ICON(icon), 20);
+ ewl_object_alignment_set(EWL_OBJECT(icon), EWL_FLAG_ALIGN_LEFT);
+ ewl_object_fill_policy_set(EWL_OBJECT(icon), EWL_FLAG_FILL_SHRINK);
+ ewl_container_child_append(EWL_CONTAINER(c), icon);
+ if (cb)
+ {
+ ewl_callback_append(icon, EWL_CALLBACK_CLICKED, cb, NULL);
+ }
+ ewl_widget_show(icon);
+
+ return;
+}
+
/*Create and Add a Menu to the Container c.*/
static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt)
{
@@ -333,7 +358,7 @@
/*Create the Main Ephoto Window*/
void create_main_gui(void)
{
- Ewl_Widget *win, *vbox, *menu_bar, *menu, *paned;
+ Ewl_Widget *win, *vbox, *toolbar, *image, *paned;
Ewl_Widget *ihbox, *sp;
win = ewl_window_new();
@@ -348,17 +373,14 @@
ewl_container_child_append(EWL_CONTAINER(win), vbox);
ewl_widget_show(vbox);
- menu_bar = ewl_hmenubar_new();
- ewl_object_fill_policy_set(EWL_OBJECT(menu_bar), EWL_FLAG_FILL_HFILL);
- ewl_container_child_append(EWL_CONTAINER(vbox), menu_bar);
- ewl_widget_show(menu_bar);
-
- menu = add_menu(menu_bar, "Menu|File");
- add_menu_item(menu, "Menu|File|Exit", PACKAGE_DATA_DIR
- "/images/exit.png", destroy);
-
- menu = add_menu(menu_bar, "Menu|Help");
- add_menu_item(menu, "Menu|Help|About", NULL, NULL);
+ toolbar = ewl_toolbar_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(toolbar),
EWL_FLAG_FILL_HFILL|EWL_FLAG_FILL_VSHRINK);
+ ewl_container_child_append(EWL_CONTAINER(vbox), toolbar);
+ ewl_widget_show(toolbar);
+
+ add_icon(toolbar, NULL, PACKAGE_DATA_DIR "/images/emblem-photos.png",
NULL);
+ add_icon(toolbar, NULL, PACKAGE_DATA_DIR
"/images/x-office-presentation.png", NULL);
+ add_icon(toolbar, NULL, PACKAGE_DATA_DIR "/images/exit.png", destroy);
paned = ewl_hpaned_new();
ewl_object_fill_policy_set(EWL_OBJECT(paned), EWL_FLAG_FILL_ALL);
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto
Modified Files:
configure.in
Log Message:
Whoops.. need this!
===
RCS file: /cvs/e/e17/proto/ephoto/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- configure.in19 Jan 2007 03:20:11 - 1.15
+++ configure.in19 Jan 2007 03:33:21 - 1.16
@@ -29,6 +29,11 @@
if test "x$LIBINTL" = "x"; then
LIBINTL="$INTLLIBS"
fi
+if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/share/locale",
[Locale-specific data directory])
+else
+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/share/locale",
[Locale-specific data directory])
+fi
dnl Set PACKAGE_DATA_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
@@ -136,10 +141,10 @@
ephoto.spec
data/Makefile
data/images/Makefile
-src/Makefile
-src/bin/Makefile
debian/changelog
po/Makefile
+src/Makefile
+src/bin/Makefile
])
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.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c
Log Message:
Whoops small fix for ephoto_gui.c here.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ephoto_gui.c19 Jan 2007 03:20:11 - 1.22
+++ ephoto_gui.c19 Jan 2007 03:22:24 - 1.23
@@ -422,5 +422,6 @@
images = ecore_list_new();
populate_files(NULL, NULL, getenv("HOME"));
+ ewl_main();
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.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto Modified Files: ABOUT-NLS INSTALL NEWS autogen.sh configure.in ephoto.spec.in Log Message: A ton of autofoo work... rework NLS a little bit. === RCS file: /cvs/e/e17/proto/ephoto/ABOUT-NLS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ABOUT-NLS 6 Oct 2006 02:32:01 - 1.1 +++ ABOUT-NLS 19 Jan 2007 03:20:11 - 1.2 @@ -171,15 +171,422 @@ == Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of April -2005. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a +matrix shows the current state of internationalization, as of May 2003. +The matrix shows, in regard of each package, for which languages PO +files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO filesen fr ja de bg es fi pl pt ru - +---+ - enlightenment | [] [] [] [] [] [] [] [] [] [] | - + Ready PO files am az be bg ca cs da de el en en_GB eo es ++---+ + a2ps | [] [] [] []| + aegis | () | + anubis | | + ap-utils | | + bash | [] [] [] | + batchelor | | + bfd| [] [] | + binutils | [] [] | + bison | [] [][] | + bluez-pin |[] []| + clisp | | + clisp | [][] [] | + coreutils | [][] [][] | + cpio | [] [][] | + darkstat | () [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs |[][] | + enscript | [][] [][] | + error | [][] [][] [] | + fetchmail | [] () [] [] [] [] | + fileutils | [] [][] | + findutils | [][] [] [] [] [] | + flex | [][] [][] | + gas|[] | + gawk | [][] [][] | + gcal | []| + gcc| [] [] | + gettext| [][][] [][] | + gettext-runtime| [][][] [][] | + gettext-tools | [][] | + gimp-print |[] [] [][] [] | + gliv | | + glunarclock|[] [] [] | + gnucash| ()[] | + gnucash-glossary | [] ()[] | + gnupg | [] ()[] [] [] [] | + gpe-calendar | [] | + gpe-conf | [] | + gpe-contacts | [] | + gpe-edit | | + gpe-login | [] | + gpe-ownerinfo | [] | + gpe-sketchbook | [] | + gpe-timesheet | | + gpe-today | [] | + gpe-todo | [] | + gphoto2|[] [] [][] | + gprof | [] [] | + gpsdrive | ()() () | + grep | [] [] [] [] [] | + gretl
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.c ephoto.h ephoto_gui.c
Log Message:
A ton of autofoo work... rework NLS a little bit.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ephoto.c22 Dec 2006 03:33:18 - 1.6
+++ ephoto.c19 Jan 2007 03:20:11 - 1.7
@@ -18,7 +18,7 @@
#endif
//ewl_theme_theme_set(PACKAGE_DATA_DIR "/themes/ephoto.edj");
/*Start the GUI*/
- init_gui();
+ create_main_gui();
return 0;
}
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ephoto.h12 Jan 2007 01:24:34 - 1.7
+++ ephoto.h19 Jan 2007 03:20:11 - 1.8
@@ -14,7 +14,7 @@
#include
/* Main gui callbacks */
-void init_gui(void);
+void create_main_gui(void);
/* Ephoto Browsing */
Ecore_List *get_directories(char *directory);
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ephoto_gui.c12 Jan 2007 01:24:34 - 1.21
+++ ephoto_gui.c19 Jan 2007 03:20:11 - 1.22
@@ -1,9 +1,5 @@
#include "ephoto.h"
-/*Destroy Boot/Create Main Window*/
-static int destroy_boot(void *data);
-static void create_main_gui(void);
-
/*Ewl Callbacks*/
static void destroy(Ewl_Widget *w, void *event, void *data);
static void populate_files(Ewl_Widget *w, void *event, void *data);
@@ -40,79 +36,6 @@
/*Ephoto Current Directory*/
static char *current_directory;
-/*Destroy Boot Splash*/
-int destroy_boot(void *data)
-{
- Ewl_Widget *win;
- double val, new_val;
-
- val = ewl_range_value_get(EWL_RANGE(progress));
- new_val = val + 20;
- ewl_range_value_set(EWL_RANGE(progress), new_val);
-
- if (new_val == 100)
- {
- win = data;
- ewl_widget_destroy(win);
- ecore_timer_del(timer);
- create_main_gui();
- }
- return 1;
-}
-
-/*Create the Boot Splash and Start its Timer*/
-void init_gui(void)
-{
- Ewl_Widget *win, *vbox, *image, *text;
-
- win = ewl_window_new();
-ewl_window_title_set(EWL_WINDOW(win), "Ephoto!");
-ewl_window_name_set(EWL_WINDOW(win), "Ephoto!");
-ewl_window_override_set(EWL_WINDOW(win), 1);
- ewl_object_size_request(EWL_OBJECT(win), 325, 240);
- ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, destroy, NULL);
-ewl_widget_state_set(win, "splash", EWL_STATE_PERSISTENT);
- ewl_widget_show(win);
-
-vbox = ewl_vbox_new();
-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 = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), VERSION);
- ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_LEFT);
- ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
- ewl_container_child_append(EWL_CONTAINER(vbox), text);
- ewl_widget_show(text);
-
- image = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image),
- PACKAGE_DATA_DIR "/images/logo.png", NULL);
- ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), image);
- ewl_widget_show(image);
-
- text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), " Ephoto\n"
- "By Stephen Houston");
- ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
- ewl_container_child_append(EWL_CONTAINER(vbox), text);
- ewl_widget_show(text);
-
- progress = ewl_progressbar_new();
- ewl_range_value_set(EWL_RANGE(progress), 0);
- ewl_object_alignment_set(EWL_OBJECT(progress), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), progress);
- ewl_object_maximum_size_set(EWL_OBJECT(progress), 200, 20);
- ewl_widget_show(progress);
-
- timer = ecore_timer_add(.2, destroy_boot, win);
-
- ewl_main();
-}
-
/*Destroy the Main Window*/
static void destroy(Ewl_Widget *w, void *event, void *data)
{
@@ -338,7 +261,7 @@
ewl_mvc_data_set(EWL_MVC(ftree), directories);
- ewl_container_reset(EWL_CONTAINER(fbox));
+ //ewl_container_reset(EWL_CONTAINER(fbox));
while (!ecore_list_is_empty(images))
{
imagef = eco
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.h ephoto_gui.c ephoto_imaging.c
Log Message:
More cleanup/work with imaging.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ephoto.h11 Jan 2007 23:14:28 - 1.6
+++ ephoto.h12 Jan 2007 01:24:34 - 1.7
@@ -21,6 +21,8 @@
Ecore_List *get_images(char *directory);
/* Ephoto Imaging */
+unsigned int *flip_horizontal(Ewl_Widget *image);
+unsigned int *flip_vertical(Ewl_Widget *image);
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);
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ephoto_gui.c11 Jan 2007 23:25:47 - 1.20
+++ ephoto_gui.c12 Jan 2007 01:24:34 - 1.21
@@ -19,10 +19,13 @@
/*Ephoto MVC Callbacks*/
static Ewl_Widget *directory_view_new(void);
static void directory_view_assign(Ewl_Widget *w, void *data);
+static Ewl_Widget *directory_header_fetch(void *data, int column);
static void *directory_data_fetch(void *data, unsigned int row, unsigned int
column);
static int directory_data_count(void *data);
/*Ephoto Image Manipulation*/
+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);
static void rotate_image_right(Ewl_Widget *w, void *event, void *data);
@@ -198,7 +201,6 @@
ewl_model_count_set(model, directory_data_count);
tree = ewl_tree2_new();
- ewl_tree2_headers_visible_set(EWL_TREE2(tree), FALSE);
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);
@@ -207,7 +209,8 @@
view = ewl_view_new();
ewl_view_constructor_set(view, directory_view_new);
ewl_view_assign_set(view, directory_view_assign);
-
+ ewl_view_header_fetch_set(view, directory_header_fetch);
+
ewl_tree2_column_append(EWL_TREE2(tree), model, view);
return tree;
@@ -249,6 +252,18 @@
ewl_callback_append(w, EWL_CALLBACK_CLICKED, populate_files, NULL);
}
+/* The header for the tree */
+static Ewl_Widget *directory_header_fetch(void *data, int column)
+{
+ Ewl_Widget *label;
+
+ label = ewl_label_new();
+ ewl_label_text_set(EWL_LABEL(label), "Browser");
+ ewl_widget_show(label);
+
+ return label;
+}
+
/* The directories that will be displayed*/
static void *directory_data_fetch(void *data, unsigned int row, unsigned int
column)
{
@@ -294,7 +309,7 @@
static void populate_files(Ewl_Widget *w, void *event, void *data)
{
char *cdir, *imagef;
- Ewl_Widget *image, *thumb;
+ Ewl_Widget *thumb;
if (w)
{
@@ -327,12 +342,9 @@
while (!ecore_list_is_empty(images))
{
imagef = ecore_list_remove_first(images);
-
- image = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image), imagef, NULL);
- thumb = ewl_image_thumbnail_get(EWL_IMAGE(image));
- ewl_image_file_set(EWL_IMAGE(thumb), PACKAGE_DATA_DIR
"/images/album.png", NULL);
+ thumb = ewl_image_thumbnail_new();
+ ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(thumb), imagef);
ewl_image_proportional_set(EWL_IMAGE(thumb), TRUE);
ewl_image_constrain_set(EWL_IMAGE(thumb), 100);
ewl_container_child_append(EWL_CONTAINER(fbox), thumb);
@@ -340,6 +352,33 @@
ewl_widget_show(thumb);
}
ewl_widget_configure(fbox);
+ ewl_widget_configure(fbox->parent);
+}
+
+/*Flip the image 180 degrees horizontally*/
+static void flip_image_horizontal(Ewl_Widget *w, void *event, void *data)
+{
+ unsigned int *image_data;
+ int nw, nh;
+
+ evas_object_image_size_get(EWL_IMAGE(vimage)->image, &nw, &nh);
+ image_data = flip_horizontal(vimage);
+ update_image(vimage, nw, nh, image_data);
+ ewl_widget_configure(vimage);
+ ewl_widget_configure(vimage->parent);
+}
+
+/*Flip the image 180 degrees vertically*/
+static void flip_image_vertical(Ewl_Widget *w, void *event, void *data)
+{
+ unsigned int *image_data;
+ int nw, nh;
+
+ evas_object_image_size_get(EWL_IMAGE(vimage)->image, &nw, &nh);
+ image_data = flip_vertical(vimage);
+ update_imag
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c ephoto_imaging.c
Log Message:
Image manipulation code for testing.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ephoto_gui.c8 Jan 2007 05:38:22 - 1.19
+++ ephoto_gui.c11 Jan 2007 23:25:47 - 1.20
@@ -16,12 +16,16 @@
static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
static Ewl_Widget *add_tree(Ewl_Widget *c);
-/*Ephoto MVC Callbacks */
+/*Ephoto MVC Callbacks*/
static Ewl_Widget *directory_view_new(void);
static void directory_view_assign(Ewl_Widget *w, void *data);
static void *directory_data_fetch(void *data, unsigned int row, unsigned int
column);
static int directory_data_count(void *data);
+/*Ephoto Image Manipulation*/
+static void rotate_image_left(Ewl_Widget *w, void *event, void *data);
+static void rotate_image_right(Ewl_Widget *w, void *event, void *data);
+
/*Ephoto Widget Global Variables*/
static Ewl_Widget *ftree, *atree, *fbox, *vnb;
static Ewl_Widget *cvbox, *ivbox, *vimage, *progress;
@@ -338,6 +342,31 @@
ewl_widget_configure(fbox);
}
+/*Rotate the image 90 degrees to the left*/
+static void rotate_image_left(Ewl_Widget *w, void *event, void *data)
+{
+ unsigned int *image_data;
+ int nw, nh;
+
+ evas_object_image_size_get(EWL_IMAGE(vimage)->image, &nh, &nw);
+ image_data = rotate_left(vimage);
+ update_image(vimage, nw, nh, image_data);
+ ewl_widget_configure(vimage);
+ ewl_widget_configure(vimage->parent);
+}
+
+static void rotate_image_right(Ewl_Widget *w, void *event, void *data)
+{
+ unsigned int *image_data;
+ int nw, nh;
+
+ evas_object_image_size_get(EWL_IMAGE(vimage)->image, &nh, &nw);
+ image_data = rotate_right(vimage);
+ update_image(vimage, nw, nh, image_data);
+ ewl_widget_configure(vimage);
+ ewl_widget_configure(vimage->parent);
+}
+
/*Create the Main Ephoto Window*/
static void create_main_gui(void)
{
@@ -401,7 +430,6 @@
ewl_object_fill_policy_set(EWL_OBJECT(ivbox), EWL_FLAG_FILL_ALL);
ewl_container_child_append(EWL_CONTAINER(vnb), ivbox);
ewl_widget_show(ivbox);
-ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(vnb), ivbox, "Viewer");
sp = ewl_scrollpane_new();
ewl_object_fill_policy_set(EWL_OBJECT(sp), EWL_FLAG_FILL_ALL);
@@ -420,7 +448,9 @@
ewl_object_alignment_set(EWL_OBJECT(ihbox), EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(ihbox), EWL_FLAG_FILL_SHRINK);
ewl_widget_show(ihbox);
-
+
+ add_button(ihbox, "Rotate Left", NULL, rotate_image_left);
+ add_button(ihbox, "Rotate Right", NULL, rotate_image_right);
add_button(ihbox, "Return to Catalog", NULL, view_catalog);
directories = ecore_list_new();
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto_imaging.c11 Jan 2007 23:14:28 - 1.1
+++ ephoto_imaging.c11 Jan 2007 23:25:47 - 1.2
@@ -12,9 +12,6 @@
evas_object_image_size_set(EWL_IMAGE(image)->image, w, h);
evas_object_image_data_set(EWL_IMAGE(image)->image, data);
evas_object_image_data_update_add(EWL_IMAGE(image)->image, 0,
0, w, h);
- ewl_image_size_set(EWL_IMAGE(image), w, h);
- ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
- ewl_widget_configure(image);
}
}
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Modified Files: Makefile.am ephoto.h Added Files: ephoto_imaging.c Log Message: Get the beginning of abstracted imaging code into cvs. === RCS file: /cvs/e/e17/proto/ephoto/src/bin/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 18 Dec 2006 19:02:44 - 1.2 +++ Makefile.am 11 Jan 2007 23:14:28 - 1.3 @@ -5,6 +5,7 @@ ephoto_test_SOURCES = ephoto.c \ ephoto_browsing.c \ ephoto_gui.c \ + ephoto_imaging.c \ ephoto_nls.c ephoto_test_CFLAGS = @ewl_cflags@ === RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ephoto.h22 Dec 2006 03:33:18 - 1.5 +++ ephoto.h11 Jan 2007 23:14:28 - 1.6 @@ -20,6 +20,11 @@ Ecore_List *get_directories(char *directory); Ecore_List *get_images(char *directory); +/* Ephoto Imaging */ +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); + /* NLS */ #ifdef ENABLE_NLS # include - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c
Log Message:
More tree2 work.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ephoto_gui.c8 Jan 2007 04:37:13 - 1.18
+++ ephoto_gui.c8 Jan 2007 05:38:22 - 1.19
@@ -234,7 +234,15 @@
ewl_icon_image_set(EWL_ICON(w), PACKAGE_DATA_DIR "/images/folder.png",
NULL);
ewl_icon_label_set(EWL_ICON(w), basename(file));
ewl_icon_constrain_set(EWL_ICON(w), 25);
- ewl_callback_append(w, EWL_CALLBACK_CLICKED, populate_files, file);
+ if (strcmp(file, ".."))
+ {
+ ewl_widget_name_set(w, file);
+ }
+ else
+ {
+ ewl_widget_name_set(w, dirname(current_directory));
+ }
+ ewl_callback_append(w, EWL_CALLBACK_CLICKED, populate_files, NULL);
}
/* The directories that will be displayed*/
@@ -281,21 +289,19 @@
/*Update the Directory List and Image List*/
static void populate_files(Ewl_Widget *w, void *event, void *data)
{
- char *cdir, *dir, *imagef;
+ char *cdir, *imagef;
Ewl_Widget *image, *thumb;
- cdir = data;
-
- /*if (strcmp(dir, ".."))
+ if (w)
{
- cdir = dir;
+ cdir = (char *)ewl_widget_name_get(w);
}
else
{
- cdir = dirname(current_directory);
+ cdir = data;
}
- current_directory = cdir;*/ /*This causes a segfault right now*/
+ current_directory = cdir;
if (!ecore_list_is_empty(directories))
{
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c
Log Message:
More tree2 work.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ephoto_gui.c8 Jan 2007 03:15:04 - 1.17
+++ ephoto_gui.c8 Jan 2007 04:37:13 - 1.18
@@ -6,6 +6,7 @@
/*Ewl Callbacks*/
static void destroy(Ewl_Widget *w, void *event, void *data);
+static void populate_files(Ewl_Widget *w, void *event, void *data);
static void view_catalog(Ewl_Widget *w, void *event, void *data);
static void view_image(Ewl_Widget *w, void *event, void *data);
@@ -14,7 +15,6 @@
static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt);
static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
static Ewl_Widget *add_tree(Ewl_Widget *c);
-static void populate_images(void);
/*Ephoto MVC Callbacks */
static Ewl_Widget *directory_view_new(void);
@@ -22,9 +22,6 @@
static void *directory_data_fetch(void *data, unsigned int row, unsigned int
column);
static int directory_data_count(void *data);
-/*Ephoto Ecore Callbacks */
-static void populate_files(char *cdir);
-
/*Ephoto Widget Global Variables*/
static Ewl_Widget *ftree, *atree, *fbox, *vnb;
static Ewl_Widget *cvbox, *ivbox, *vimage, *progress;
@@ -33,6 +30,9 @@
static Ecore_Timer *timer;
static Ecore_List *directories, *images;
+/*Ephoto Current Directory*/
+static char *current_directory;
+
/*Destroy Boot Splash*/
int destroy_boot(void *data)
{
@@ -195,7 +195,6 @@
tree = ewl_tree2_new();
ewl_tree2_headers_visible_set(EWL_TREE2(tree), FALSE);
- ewl_mvc_data_set(EWL_MVC(tree), directories);
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);
@@ -235,6 +234,7 @@
ewl_icon_image_set(EWL_ICON(w), PACKAGE_DATA_DIR "/images/folder.png",
NULL);
ewl_icon_label_set(EWL_ICON(w), basename(file));
ewl_icon_constrain_set(EWL_ICON(w), 25);
+ ewl_callback_append(w, EWL_CALLBACK_CLICKED, populate_files, file);
}
/* The directories that will be displayed*/
@@ -279,8 +279,24 @@
}
/*Update the Directory List and Image List*/
-static void populate_files(char *cdir)
+static void populate_files(Ewl_Widget *w, void *event, void *data)
{
+ char *cdir, *dir, *imagef;
+ Ewl_Widget *image, *thumb;
+
+ cdir = data;
+
+ /*if (strcmp(dir, ".."))
+ {
+ cdir = dir;
+ }
+ else
+ {
+ cdir = dirname(current_directory);
+ }
+
+ current_directory = cdir;*/ /*This causes a segfault right now*/
+
if (!ecore_list_is_empty(directories))
{
ecore_list_destroy(directories);
@@ -294,13 +310,8 @@
directories = get_directories(cdir);
images = get_images(cdir);
-}
-/* Add the thumbnails to the freebox */
-static void populate_images(void)
-{
- char *imagef;
- Ewl_Widget *image, *thumb;
+ ewl_mvc_data_set(EWL_MVC(ftree), directories);
ewl_container_reset(EWL_CONTAINER(fbox));
while (!ecore_list_is_empty(images))
@@ -327,10 +338,6 @@
Ewl_Widget *win, *vbox, *menu_bar, *menu, *paned;
Ewl_Widget *ihbox, *sp;
- directories = ecore_list_new();
- images = ecore_list_new();
- populate_files(getenv("HOME"));
-
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "Ephoto!");
ewl_window_name_set(EWL_WINDOW(win), "Ephoto!");
@@ -410,7 +417,9 @@
add_button(ihbox, "Return to Catalog", NULL, view_catalog);
- populate_images();
+ directories = ecore_list_new();
+ images = ecore_list_new();
+ populate_files(NULL, NULL, getenv("HOME"));
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.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c
Log Message:
More tree2 work, and added comments
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ephoto_gui.c7 Jan 2007 02:06:50 - 1.16
+++ ephoto_gui.c8 Jan 2007 03:15:04 - 1.17
@@ -14,6 +14,15 @@
static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt);
static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
static Ewl_Widget *add_tree(Ewl_Widget *c);
+static void populate_images(void);
+
+/*Ephoto MVC Callbacks */
+static Ewl_Widget *directory_view_new(void);
+static void directory_view_assign(Ewl_Widget *w, void *data);
+static void *directory_data_fetch(void *data, unsigned int row, unsigned int
column);
+static int directory_data_count(void *data);
+
+/*Ephoto Ecore Callbacks */
static void populate_files(char *cdir);
/*Ephoto Widget Global Variables*/
@@ -173,17 +182,51 @@
return;
}
+/*Create and Add a Tree to the Container c*/
+static Ewl_Widget *add_tree(Ewl_Widget *c)
+{
+ Ewl_Widget *tree;
+ Ewl_Model *model;
+ Ewl_View *view;
+
+ model = ewl_model_new();
+ ewl_model_fetch_set(model, directory_data_fetch);
+ ewl_model_count_set(model, directory_data_count);
+
+ tree = ewl_tree2_new();
+ ewl_tree2_headers_visible_set(EWL_TREE2(tree), FALSE);
+ ewl_mvc_data_set(EWL_MVC(tree), directories);
+ 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_constructor_set(view, directory_view_new);
+ ewl_view_assign_set(view, directory_view_assign);
+
+ ewl_tree2_column_append(EWL_TREE2(tree), model, view);
+
+ return tree;
+}
+
+
+/* The view of the users directories */
static Ewl_Widget *directory_view_new(void)
{
Ewl_Widget *icon;
icon = ewl_icon_new();
+ ewl_icon_thumbnailing_set(EWL_ICON(icon), FALSE);
ewl_box_orientation_set(EWL_BOX(icon), EWL_ORIENTATION_HORIZONTAL);
+ ewl_object_alignment_set(EWL_OBJECT(icon), EWL_FLAG_ALIGN_LEFT);
+ ewl_object_fill_policy_set(EWL_OBJECT(icon), EWL_FLAG_FILL_ALL);
ewl_widget_show(icon);
return icon;
}
+/*The row that is added to the tree*/
static void directory_view_assign(Ewl_Widget *w, void *data)
{
char *file;
@@ -191,20 +234,10 @@
file = data;
ewl_icon_image_set(EWL_ICON(w), PACKAGE_DATA_DIR "/images/folder.png",
NULL);
ewl_icon_label_set(EWL_ICON(w), basename(file));
- ewl_icon_constrain_set(EWL_ICON(w), 20);
+ ewl_icon_constrain_set(EWL_ICON(w), 25);
}
-static Ewl_Widget *directory_header_fetch(void *data, int column)
-{
- Ewl_Widget *label;
-
- label = ewl_label_new();
- ewl_label_text_set(EWL_LABEL(label), "Directories");
- ewl_widget_show(label);
-
- return label;
-}
-
+/* The directories that will be displayed*/
static void *directory_data_fetch(void *data, unsigned int row, unsigned int
column)
{
char *file;
@@ -219,11 +252,7 @@
return val;
}
-static void directory_data_sort(void *data, unsigned int column,
Ewl_Sort_Direction sort)
-{
- return;
-}
-
+/* The number of directories the view is displaying */
static int directory_data_count(void *data)
{
int val;
@@ -233,37 +262,6 @@
return val;
}
-/*Create and Add a Tree to the Container c*/
-static Ewl_Widget *add_tree(Ewl_Widget *c)
-{
- Ewl_Widget *tree;
- Ewl_Model *model;
- Ewl_View *view;
-
- model = ewl_model_new();
- ewl_model_fetch_set(model, directory_data_fetch);
- ewl_model_sort_set(model, directory_data_sort);
- ewl_model_count_set(model, directory_data_count);
- ewl_model_expandable_set(model, NULL);
- ewl_model_subfetch_set(model, NULL);
-
- tree = ewl_tree2_new();
- ewl_mvc_data_set(EWL_MVC(tree), directories);
- 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_constructor_set(view, directory_view_new);
- ewl_view_assign_set(view, directory_view_assign);
- ewl_view_header_fetch_set(view, directory_header_fetch);
-
- ewl_tree2_column_append(EWL_TREE2(tree), model, view);
-
- return tree;
-}
-
/*Switch to the Image List*/
static void view_catalog(Ewl_Widget *w, void *event, void *da
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c
Log Message:
First step towards tree2.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ephoto_gui.c2 Jan 2007 09:32:48 - 1.15
+++ ephoto_gui.c7 Jan 2007 02:06:50 - 1.16
@@ -16,9 +16,13 @@
static Ewl_Widget *add_tree(Ewl_Widget *c);
static void populate_files(char *cdir);
-/*Ephoto Global Variables*/
-static Ewl_Widget *ftree, *atree, *fbox, *vnb, *cvbox, *ivbox, *vimage,
*progress;
+/*Ephoto Widget Global Variables*/
+static Ewl_Widget *ftree, *atree, *fbox, *vnb;
+static Ewl_Widget *cvbox, *ivbox, *vimage, *progress;
+
+/*Ephoto Ecore Global Variables*/
static Ecore_Timer *timer;
+static Ecore_List *directories, *images;
/*Destroy Boot Splash*/
int destroy_boot(void *data)
@@ -169,18 +173,94 @@
return;
}
+static Ewl_Widget *directory_view_new(void)
+{
+ Ewl_Widget *icon;
+
+ icon = ewl_icon_new();
+ ewl_box_orientation_set(EWL_BOX(icon), EWL_ORIENTATION_HORIZONTAL);
+ ewl_widget_show(icon);
+
+ return icon;
+}
+
+static void directory_view_assign(Ewl_Widget *w, void *data)
+{
+ char *file;
+
+ file = data;
+ ewl_icon_image_set(EWL_ICON(w), PACKAGE_DATA_DIR "/images/folder.png",
NULL);
+ ewl_icon_label_set(EWL_ICON(w), basename(file));
+ ewl_icon_constrain_set(EWL_ICON(w), 20);
+}
+
+static Ewl_Widget *directory_header_fetch(void *data, int column)
+{
+ Ewl_Widget *label;
+
+ label = ewl_label_new();
+ ewl_label_text_set(EWL_LABEL(label), "Directories");
+ ewl_widget_show(label);
+
+ return label;
+}
+
+static void *directory_data_fetch(void *data, unsigned int row, unsigned int
column)
+{
+ char *file;
+ void *val = NULL;
+
+ file = ecore_list_goto_index(directories, row);
+ if (file)
+ {
+ val = file;
+ }
+
+ return val;
+}
+
+static void directory_data_sort(void *data, unsigned int column,
Ewl_Sort_Direction sort)
+{
+ return;
+}
+
+static int directory_data_count(void *data)
+{
+ int val;
+
+ val = ecore_list_nodes(directories);
+
+ return val;
+}
+
/*Create and Add a Tree to the Container c*/
static Ewl_Widget *add_tree(Ewl_Widget *c)
{
Ewl_Widget *tree;
+ Ewl_Model *model;
+ Ewl_View *view;
- tree = ewl_tree_new(1);
- ewl_tree_headers_visible_set(EWL_TREE(tree), 0);
- ewl_tree_expandable_rows_set(EWL_TREE(tree), 0);
+ model = ewl_model_new();
+ ewl_model_fetch_set(model, directory_data_fetch);
+ ewl_model_sort_set(model, directory_data_sort);
+ ewl_model_count_set(model, directory_data_count);
+ ewl_model_expandable_set(model, NULL);
+ ewl_model_subfetch_set(model, NULL);
+
+ tree = ewl_tree2_new();
+ ewl_mvc_data_set(EWL_MVC(tree), directories);
+ 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_constructor_set(view, directory_view_new);
+ ewl_view_assign_set(view, directory_view_assign);
+ ewl_view_header_fetch_set(view, directory_header_fetch);
+
+ ewl_tree2_column_append(EWL_TREE2(tree), model, view);
+
return tree;
}
@@ -203,67 +283,54 @@
/*Update the Directory Listing and Image List*/
static void populate_files(char *cdir)
{
- char *dir, *imagef;
- Ecore_List *directories, *images;
- Ewl_Widget *hbox, *image, *text, *children[2], *row;
+ if (!ecore_list_is_empty(directories))
+ {
+ ecore_list_destroy(directories);
+ directories = ecore_list_new();
+ }
+ if (!ecore_list_is_empty(images))
+ {
+ ecore_list_destroy(images);
+ images = ecore_list_new();
+ }
directories = get_directories(cdir);
images = get_images(cdir);
+}
- ewl_container_reset(EWL_CONTAINER(ftree));
- while (!ecore_list_is_empty(directories))
- {
- dir = ecore_list_remove_first(directories);
-
- hbox = ewl_hbox_new();
- ewl_object_alignment_set(EWL_OBJECT(hbox),
EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
- ewl_box_spacing_set(EWL_BOX(hbox), 5);
- ewl_widget_show(hbox);
-
- image = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image),
- PACKAGE_DATA_DIR "/images/folder.png", NULL)
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto Modified Files: AUTHORS Log Message: Update my information in the AUTHORS files I am associated with. Lame commit I know. === RCS file: /cvs/e/e17/proto/ephoto/AUTHORS,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- AUTHORS 6 Oct 2006 21:45:16 - 1.6 +++ AUTHORS 2 Jan 2007 09:32:48 - 1.7 @@ -6,4 +6,4 @@ / /__/ /__/ /__/ /___//_//___/ ===Project Manager/Lead Developer=== -Stephen "LinuxTitan" Houston <[EMAIL PROTECTED]> +Stephen "UnixTitan" Houston <[EMAIL PROTECTED]> - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/empower Modified Files: AUTHORS Log Message: Update my information in the AUTHORS files I am associated with. Lame commit I know. === RCS file: /cvs/e/e17/proto/empower/AUTHORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- AUTHORS 18 Dec 2006 04:43:10 - 1.4 +++ AUTHORS 2 Jan 2007 09:32:48 - 1.5 @@ -1,3 +1,3 @@ Mekius_ (Nick Hughart) <[EMAIL PROTECTED]> CodeWarrior (Hisham Mardam Bey) <[EMAIL PROTECTED]> -LinuxTitan (Stephen Houston) <[EMAIL PROTECTED]> +UnixTitan (Stephen Houston) <[EMAIL PROTECTED]> - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Modified Files: ephoto_gui.c Log Message: Update my information in the AUTHORS files I am associated with. Lame commit I know. === RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ephoto_gui.c29 Dec 2006 12:17:46 - 1.14 +++ ephoto_gui.c2 Jan 2007 09:32:48 - 1.15 @@ -88,7 +88,7 @@ ewl_object_maximum_size_set(EWL_OBJECT(progress), 200, 20); ewl_widget_show(progress); - timer = ecore_timer_add(.3, destroy_boot, win); + timer = ecore_timer_add(.2, destroy_boot, win); ewl_main(); } - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.c ephoto.h ephoto_browsing.c ephoto_gui.c ephoto_nls.c
Log Message:
Cleanup and add comments
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ephoto.c4 Dec 2006 23:16:35 - 1.5
+++ ephoto.c22 Dec 2006 03:33:18 - 1.6
@@ -2,6 +2,7 @@
int main(int argc, char **argv)
{
+ /*Check to make sure EWL is accessible*/
if (!ewl_init(&argc, argv))
{
printf("Ewl is not usable, please check your installation!\n");
@@ -16,6 +17,7 @@
textdomain(PACKAGE);
#endif
//ewl_theme_theme_set(PACKAGE_DATA_DIR "/themes/ephoto.edj");
+ /*Start the GUI*/
init_gui();
return 0;
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ephoto.h5 Dec 2006 03:04:15 - 1.4
+++ ephoto.h22 Dec 2006 03:33:18 - 1.5
@@ -16,7 +16,7 @@
/* Main gui callbacks */
void init_gui(void);
-/* Ephoto Utilities */
+/* Ephoto Browsing */
Ecore_List *get_directories(char *directory);
Ecore_List *get_images(char *directory);
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_browsing.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto_browsing.c 18 Dec 2006 19:02:44 - 1.1
+++ ephoto_browsing.c 22 Dec 2006 03:33:18 - 1.2
@@ -1,5 +1,6 @@
#include "ephoto.h"
+/*Populate a List of Sub Directories Inside of Directory.*/
Ecore_List *get_directories(char *directory)
{
Ecore_List *ls, *files;
@@ -45,6 +46,7 @@
return files;
}
+/*Populate a List of Images Inside of Directory*/
Ecore_List *get_images(char *directory)
{
Ecore_List *ls, *files;
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto_gui.c19 Dec 2006 06:26:43 - 1.12
+++ ephoto_gui.c22 Dec 2006 03:33:18 - 1.13
@@ -1,19 +1,26 @@
#include "ephoto.h"
+/*Destroy Boot/Create Main Window*/
+static int destroy_boot(void *data);
+static void create_main_gui(void);
+
+/*Ewl Callbacks*/
static void destroy(Ewl_Widget *w, void *event, void *data);
-static void view_image(Ewl_Widget *w, void *event, void *data);
static void view_catalog(Ewl_Widget *w, void *event, void *data);
-static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
+static void view_image(Ewl_Widget *w, void *event, void *data);
+
+/*Ephoto Widget Creation Callbacks*/
static void add_button(Ewl_Widget *c, char *txt, char *img, void *cb);
-static void populate_files(char *cdir);
-static void create_main_gui(void);
-static int destroy_boot(void *data);
static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt);
+static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
static Ewl_Widget *add_tree(Ewl_Widget *c);
+static void populate_files(char *cdir);
+
+/*Ephoto Global Variables*/
static Ewl_Widget *ftree, *atree, *fbox, *vnb, *cvbox, *ivbox, *vimage,
*progress;
static Ecore_Timer *timer;
-/*Boot Splash*/
+/*Destroy Boot Splash*/
int destroy_boot(void *data)
{
Ewl_Widget *win;
@@ -32,6 +39,7 @@
}
}
+/*Create the Boot Splash and Start its Timer*/
void init_gui(void)
{
Ewl_Widget *win, *vbox, *image, *text;
@@ -84,13 +92,40 @@
ewl_main();
}
-/*Main Window Calls*/
+/*Destroy the Main Window*/
static void destroy(Ewl_Widget *w, void *event, void *data)
{
ewl_widget_destroy(w);
ewl_main_quit();
}
+/*Create and Add a Button the Container c*/
+static void add_button(Ewl_Widget *c, char *txt, char *img, void *cb)
+{
+ 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));
+ }
+ ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
+ ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
+ ewl_container_child_append(EWL_CONTAINER(c), button);
+ if (cb)
+ {
+ ewl_callback_append(button, EWL_CALLBACK_CLICKED, cb, NULL);
+ }
+ ewl_widget_show(button);
+
+ return;
+}
+
+/*Create and Add a Menu to the Container c.*/
static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt)
{
Ewl_Widget *menu;
@@ -107,6 +142,7 @@
return menu;
}
+/*Create a
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c
Log Message:
Add a generic viewer for testing purposes.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto_gui.c18 Dec 2006 19:02:44 - 1.11
+++ ephoto_gui.c19 Dec 2006 06:26:43 - 1.12
@@ -1,6 +1,8 @@
#include "ephoto.h"
static void destroy(Ewl_Widget *w, void *event, void *data);
+static void view_image(Ewl_Widget *w, void *event, void *data);
+static void view_catalog(Ewl_Widget *w, void *event, void *data);
static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
static void add_button(Ewl_Widget *c, char *txt, char *img, void *cb);
static void populate_files(char *cdir);
@@ -8,7 +10,7 @@
static int destroy_boot(void *data);
static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt);
static Ewl_Widget *add_tree(Ewl_Widget *c);
-static Ewl_Widget *ftree, *atree, *fbox, *progress;
+static Ewl_Widget *ftree, *atree, *fbox, *vnb, *cvbox, *ivbox, *vimage,
*progress;
static Ecore_Timer *timer;
/*Boot Splash*/
@@ -169,6 +171,20 @@
return tree;
}
+static void view_image(Ewl_Widget *w, void *event, void *data)
+{
+ char *file;
+
+ file = data;
+ ewl_image_file_set(EWL_IMAGE(vimage), file, NULL);
+ ewl_notebook_visible_page_set(EWL_NOTEBOOK(vnb), ivbox);
+}
+
+static void view_catalog(Ewl_Widget *w, void *event, void *data)
+{
+ ewl_notebook_visible_page_set(EWL_NOTEBOOK(vnb), cvbox);
+}
+
static void populate_files(char *cdir)
{
char *dir, *imagef;
@@ -219,6 +235,7 @@
ewl_image_constrain_set(EWL_IMAGE(image), 100);
ewl_object_alignment_set(EWL_OBJECT(image),
EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(fbox), image);
+ewl_callback_append(image, EWL_CALLBACK_CLICKED, view_image,
imagef);
ewl_widget_show(image);
}
ewl_widget_configure(ftree);
@@ -229,7 +246,7 @@
static void create_main_gui(void)
{
Ewl_Widget *win, *vbox, *menu_bar, *menu, *nb, *paned;
- Ewl_Widget *border, *ivbox, *ihbox, *sp, *image, *button;
+ Ewl_Widget *border, *ihbox, *sp, *image, *button;
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "Ephoto!");
@@ -271,16 +288,23 @@
atree = add_tree(nb);
ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), atree, "Albums");
- ivbox = ewl_vbox_new();
- ewl_object_fill_policy_set(EWL_OBJECT(ivbox), EWL_FLAG_FILL_ALL);
- ewl_container_child_append(EWL_CONTAINER(paned), ivbox);
- ewl_widget_show(ivbox);
+ vnb = ewl_notebook_new();
+ ewl_notebook_tabbar_visible_set(EWL_NOTEBOOK(vnb), 0);
+ ewl_object_fill_policy_set(EWL_OBJECT(vnb), EWL_FLAG_FILL_ALL);
+ ewl_container_child_append(EWL_CONTAINER(paned), vnb);
+ ewl_widget_show(vnb);
+
+ cvbox = ewl_vbox_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(cvbox), EWL_FLAG_FILL_ALL);
+ ewl_container_child_append(EWL_CONTAINER(vnb), cvbox);
+ ewl_widget_show(cvbox);
+ ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(vnb), cvbox, "Catalog");
border = ewl_border_new();
ewl_border_label_set(EWL_BORDER(border), "Catalog");
ewl_border_label_alignment_set(EWL_BORDER(border),
EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(border), EWL_FLAG_FILL_ALL);
- ewl_container_child_append(EWL_CONTAINER(ivbox), border);
+ ewl_container_child_append(EWL_CONTAINER(cvbox), border);
ewl_widget_show(border);
sp = ewl_scrollpane_new();
@@ -293,12 +317,30 @@
ewl_container_child_append(EWL_CONTAINER(sp), fbox);
ewl_widget_show(fbox);
- image = ewl_image_new();
- ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
- ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_SHRINK);
- ewl_container_child_append(EWL_CONTAINER(sp), image);
- ewl_widget_show(image);
+ ivbox = ewl_vbox_new();
+ewl_object_fill_policy_set(EWL_OBJECT(ivbox), EWL_FLAG_FILL_ALL);
+ewl_container_child_append(EWL_CONTAINER(vnb), ivbox);
+ewl_widget_show(ivbox);
+ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(vnb), ivbox, "Viewer");
+
+border = ewl_border_new();
+ewl_border_label_set(EWL_BORDER(border), "Image Viewer");
+ewl_border_label_alignment_set(EWL_BORDER(border),
EWL_FLAG_ALIGN_CENTER);
+ewl_object_fill_policy_set(EWL_OBJECT(border), EWL_FLAG_FILL_ALL);
+ewl_container_child_append(EWL_CONTAINER(ivbox), border);
+ewl_widget_show(border);
+
+sp = ew
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
Makefile.am ephoto_gui.c
Added Files:
ephoto_browsing.c
Removed Files:
ephoto_utils.c
Log Message:
Rename a file.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 3 Dec 2006 22:04:46 - 1.1
+++ Makefile.am 18 Dec 2006 19:02:44 - 1.2
@@ -2,8 +2,11 @@
bin_PROGRAMS = ephoto_test
-ephoto_test_SOURCES = ephoto.c ephoto_gui.c ephoto_nls.c ephoto_utils.c
-
+ephoto_test_SOURCES = ephoto.c \
+ ephoto_browsing.c \
+ ephoto_gui.c \
+ ephoto_nls.c
+
ephoto_test_CFLAGS = @ewl_cflags@
ephoto_test_LDADD = @ewl_libs@
===
RCS file: /cvs/e/e17/proto/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 Dec 2006 21:51:28 - 1.10
+++ ephoto_gui.c18 Dec 2006 19:02:44 - 1.11
@@ -306,11 +306,12 @@
ewl_object_fill_policy_set(EWL_OBJECT(ihbox), EWL_FLAG_FILL_SHRINK);
ewl_widget_show(ihbox);
- add_button(ihbox, "Refresh", NULL, NULL);
+ add_button(ihbox, "In", NULL, NULL);
+ add_button(ihbox, "Out", NULL, NULL);
+ add_button(ihbox, "Fit", NULL, NULL);
+ add_button(ihbox, "1:1", NULL, NULL);
add_button(ihbox, "Left", NULL, NULL);
add_button(ihbox, "Right", NULL, NULL);
- add_button(ihbox, "Edit", NULL, NULL);
- add_button(ihbox, "Slideshow", NULL, NULL);
populate_files(getenv("HOME"));
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c ephoto_utils.c
Log Message:
Fixup ephoto_test some more.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ephoto_gui.c11 Dec 2006 06:15:54 - 1.9
+++ ephoto_gui.c15 Dec 2006 21:51:28 - 1.10
@@ -3,7 +3,7 @@
static void destroy(Ewl_Widget *w, void *event, void *data);
static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
static void add_button(Ewl_Widget *c, char *txt, char *img, void *cb);
-static void populate_files(Ewl_Widget *c, void *event, void *data);
+static void populate_files(char *cdir);
static void create_main_gui(void);
static int destroy_boot(void *data);
static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt);
@@ -169,13 +169,12 @@
return tree;
}
-static void populate_files(Ewl_Widget *w, void *event, void *data)
+static void populate_files(char *cdir)
{
- char *cdir, *dir, *imagef;
+ char *dir, *imagef;
Ecore_List *directories, *images;
Ewl_Widget *hbox, *image, *text, *children[2], *row;
- cdir = data;
directories = get_directories(cdir);
images = get_images(cdir);
@@ -207,24 +206,6 @@
children[1] = NULL;
row = ewl_tree_row_add(EWL_TREE(ftree), NULL, children);
- if (!strcmp(cdir, ".."))
- {
- if (strchr(cdir, '/'))
- {
- ewl_callback_append(row, EWL_CALLBACK_CLICKED,
- populate_files,
strchr(cdir, '/'));
- }
- else
- {
- ewl_callback_append(row, EWL_CALLBACK_CLICKED,
- populate_files, "/");
- }
- }
- else
- {
-ewl_callback_append(row, EWL_CALLBACK_CLICKED,
-populate_files, dir);
- }
}
ewl_widget_configure(ftree);
@@ -232,15 +213,17 @@
while (!ecore_list_is_empty(images))
{
imagef = ecore_list_remove_first(images);
-
image = ewl_image_thumbnail_new();
ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(image), imagef);
ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
+ ewl_image_constrain_set(EWL_IMAGE(image), 100);
ewl_object_alignment_set(EWL_OBJECT(image),
EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(fbox), image);
ewl_widget_show(image);
}
ewl_widget_configure(ftree);
+ ecore_list_destroy(directories);
+ ecore_list_destroy(images);
}
static void create_main_gui(void)
@@ -251,7 +234,7 @@
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "Ephoto!");
ewl_window_name_set(EWL_WINDOW(win), "Ephoto!");
-ewl_object_size_request(EWL_OBJECT(win), 800, 600);
+ewl_object_size_request(EWL_OBJECT(win), 600, 400);
ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, destroy, NULL);
ewl_widget_show(win);
@@ -284,7 +267,6 @@
ewl_widget_show(nb);
ftree = add_tree(nb);
- ewl_callback_append(ftree, EWL_CALLBACK_SHOW, populate_files,
getenv("HOME"));
ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), ftree, "Files");
atree = add_tree(nb);
ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), atree, "Albums");
@@ -329,6 +311,8 @@
add_button(ihbox, "Right", NULL, NULL);
add_button(ihbox, "Edit", NULL, NULL);
add_button(ihbox, "Slideshow", NULL, NULL);
+
+ populate_files(getenv("HOME"));
return;
}
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto_utils.c 5 Dec 2006 03:10:10 - 1.3
+++ ephoto_utils.c 15 Dec 2006 21:51:28 - 1.4
@@ -41,6 +41,7 @@
{
files = NULL;
}
+ ecore_list_goto_first(files);
return files;
}
@@ -71,35 +72,18 @@
snprintf(path, PATH_MAX, "%s%s",
directory, file);
}
-}
-
- if (fnmatch("*.[Jj][Pp][Ee][Gg]", path, 0) == 0)
- {
- ecore_list_append(files, strdup(path));
-
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c
Log Message:
Make the window borderless
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ephoto_gui.c10 Dec 2006 22:05:37 - 1.8
+++ ephoto_gui.c11 Dec 2006 06:15:54 - 1.9
@@ -30,11 +30,6 @@
}
}
-static void center_splash(Ewl_Widget *w, void *event, void *data)
-{
- ewl_window_move(EWL_WINDOW(w), 50, 50);
-}
-
void init_gui(void)
{
Ewl_Widget *win, *vbox, *image, *text;
@@ -42,12 +37,11 @@
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "Ephoto!");
ewl_window_name_set(EWL_WINDOW(win), "Ephoto!");
-ewl_window_borderless_set(EWL_WINDOW(win));
- ewl_widget_state_set(win, "splash", EWL_STATE_PERSISTENT);
+ewl_window_override_set(EWL_WINDOW(win), 1);
ewl_object_size_request(EWL_OBJECT(win), 325, 240);
- ewl_callback_append(win, EWL_CALLBACK_SHOW, center_splash, NULL);
ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, destroy, NULL);
-ewl_widget_show(win);
+ewl_widget_state_set(win, "splash", EWL_STATE_PERSISTENT);
+ ewl_widget_show(win);
vbox = ewl_vbox_new();
ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/data/images Modified Files: Makefile.am Log Message: Fix make error. === RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 3 Dec 2006 22:04:46 - 1.10 +++ Makefile.am 7 Dec 2006 01:12:48 - 1.11 @@ -15,7 +15,6 @@ go-down.png \ go-next.png \ image.png \ - logo.png \ preferences-system.png \ redo.png \ remove.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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Modified Files: ephoto_gui.c Log Message: Speed her up! === RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ephoto_gui.c5 Dec 2006 03:04:15 - 1.6 +++ ephoto_gui.c5 Dec 2006 03:15:30 - 1.7 @@ -77,7 +77,7 @@ ewl_object_maximum_size_set(EWL_OBJECT(progress), 200, 20); ewl_widget_show(progress); - timer = ecore_timer_add(1, destroy_boot, win); + timer = ecore_timer_add(.3, destroy_boot, win); ewl_main(); } - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_utils.c
Log Message:
Minor fix
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_utils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ephoto_utils.c 5 Dec 2006 03:04:15 - 1.2
+++ ephoto_utils.c 5 Dec 2006 03:10:10 - 1.3
@@ -10,9 +10,10 @@
{
ls = ecore_list_new();
files = ecore_list_new();
-
- ecore_list_append(files, strdup(".."));
-
+ if (strcmp(directory, "/"))
+ {
+ ecore_list_append(files, strdup(".."));
+ }
ls = ecore_file_ls(directory);
while (!ecore_list_is_empty(ls))
{
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.h ephoto_gui.c ephoto_utils.c
Log Message:
Add a little more work to the test ephoto.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto.h3 Dec 2006 21:51:32 - 1.3
+++ ephoto.h5 Dec 2006 03:04:15 - 1.4
@@ -17,7 +17,8 @@
void init_gui(void);
/* Ephoto Utilities */
-Ecore_List *get_files(char *directory);
+Ecore_List *get_directories(char *directory);
+Ecore_List *get_images(char *directory);
/* NLS */
#ifdef ENABLE_NLS
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ephoto_gui.c3 Dec 2006 21:52:12 - 1.5
+++ ephoto_gui.c5 Dec 2006 03:04:15 - 1.6
@@ -3,11 +3,12 @@
static void destroy(Ewl_Widget *w, void *event, void *data);
static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
static void add_button(Ewl_Widget *c, char *txt, char *img, void *cb);
+static void populate_files(Ewl_Widget *c, void *event, void *data);
static void create_main_gui(void);
static int destroy_boot(void *data);
static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt);
static Ewl_Widget *add_tree(Ewl_Widget *c);
-static Ewl_Widget *progress;
+static Ewl_Widget *ftree, *atree, *fbox, *progress;
static Ecore_Timer *timer;
/*Boot Splash*/
@@ -168,15 +169,89 @@
return tree;
}
+static void populate_files(Ewl_Widget *w, void *event, void *data)
+{
+ char *cdir, *dir, *imagef;
+ Ecore_List *directories, *images;
+ Ewl_Widget *hbox, *image, *text, *children[2], *row;
+
+ cdir = data;
+ directories = get_directories(cdir);
+ images = get_images(cdir);
+
+ ewl_container_reset(EWL_CONTAINER(ftree));
+ while (!ecore_list_is_empty(directories))
+ {
+ dir = ecore_list_remove_first(directories);
+
+ hbox = ewl_hbox_new();
+ ewl_object_alignment_set(EWL_OBJECT(hbox),
EWL_FLAG_ALIGN_CENTER);
+ ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
+ ewl_box_spacing_set(EWL_BOX(hbox), 5);
+ ewl_widget_show(hbox);
+
+ image = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image),
+ PACKAGE_DATA_DIR "/images/folder.png", NULL);
+ ewl_container_child_append(EWL_CONTAINER(hbox), image);
+ ewl_widget_show(image);
+
+ text = ewl_text_new();
+ ewl_text_text_set(EWL_TEXT(text), basename(dir));
+ ewl_object_alignment_set(EWL_OBJECT(text),
EWL_FLAG_ALIGN_CENTER);
+ ewl_object_fill_policy_set(EWL_OBJECT(text),
EWL_FLAG_FILL_SHRINK);
+ ewl_container_child_append(EWL_CONTAINER(hbox), text);
+ ewl_widget_show(text);
+
+ children[0] = hbox;
+ children[1] = NULL;
+
+ row = ewl_tree_row_add(EWL_TREE(ftree), NULL, children);
+ if (!strcmp(cdir, ".."))
+ {
+ if (strchr(cdir, '/'))
+ {
+ ewl_callback_append(row, EWL_CALLBACK_CLICKED,
+ populate_files,
strchr(cdir, '/'));
+ }
+ else
+ {
+ ewl_callback_append(row, EWL_CALLBACK_CLICKED,
+ populate_files, "/");
+ }
+ }
+ else
+ {
+ewl_callback_append(row, EWL_CALLBACK_CLICKED,
+populate_files, dir);
+ }
+ }
+ ewl_widget_configure(ftree);
+
+ ewl_container_reset(EWL_CONTAINER(fbox));
+ while (!ecore_list_is_empty(images))
+ {
+ imagef = ecore_list_remove_first(images);
+
+ image = ewl_image_thumbnail_new();
+ ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(image), imagef);
+ ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
+ ewl_object_alignment_set(EWL_OBJECT(image),
EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(fbox), image);
+ ewl_widget_show(image);
+ }
+ ewl_widget_configure(ftree);
+}
+
static void create_main_gui(void)
{
- Ewl_Widget *win, *atree, *btree, *vbox, *menu_bar, *menu, *nb, *paned;
- Ewl_Widget *ivbox, *ihbox, *sp, *image, *button;
+ Ewl_Widget *win,
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Modified Files: ephoto.c Log Message: whoops === RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ephoto.c4 Dec 2006 23:13:35 - 1.4 +++ ephoto.c4 Dec 2006 23:16:35 - 1.5 @@ -9,7 +9,7 @@ } /* NLS */ -#ifdef ENABLE_NSL +#ifdef ENABLE_NLS setlocale(LC_MESSAGES, ""); bindtextdomain(PACKAGE, PACKAGE_LOCALE_DIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Modified Files: ephoto.c Log Message: Fix NLS === RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ephoto.c2 Dec 2006 19:33:31 - 1.3 +++ ephoto.c4 Dec 2006 23:13:35 - 1.4 @@ -8,6 +8,13 @@ return 1; } + /* NLS */ +#ifdef ENABLE_NSL + setlocale(LC_MESSAGES, ""); + bindtextdomain(PACKAGE, PACKAGE_LOCALE_DIR); + bind_textdomain_codeset(PACKAGE, "UTF-8"); + textdomain(PACKAGE); +#endif //ewl_theme_theme_set(PACKAGE_DATA_DIR "/themes/ephoto.edj"); init_gui(); - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/data/images Modified Files: Makefile.am Log Message: Make the src/bin stuff compile now. It is installed as ephoto_test. === RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 9 Oct 2006 03:22:36 - 1.9 +++ Makefile.am 3 Dec 2006 22:04:46 - 1.10 @@ -15,6 +15,7 @@ go-down.png \ go-next.png \ image.png \ + logo.png \ preferences-system.png \ redo.png \ remove.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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: Makefile.am ephoto.h Log Message: Make the src/bin stuff compile now. It is installed as ephoto_test. === RCS file: /cvs/e/e17/proto/ephoto/src/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Makefile.am 24 Oct 2006 15:34:05 - 1.7 +++ Makefile.am 3 Dec 2006 22:04:46 - 1.8 @@ -1,8 +1,6 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = \ --I$(top_srcdir) -I$(top_srcdir)/src/include -I$(top_srcdir)/src/lib \ --I$(top_builddir)/src/lib +SUBDIRS = bin bin_PROGRAMS = ephoto === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- ephoto.h24 Oct 2006 15:56:25 - 1.44 +++ ephoto.h3 Dec 2006 22:04:46 - 1.45 @@ -11,6 +11,7 @@ #include #include #include +#include #include "config.h" /* NLS */ - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto Modified Files: configure.in Log Message: Make the src/bin stuff compile now. It is installed as ephoto_test. === RCS file: /cvs/e/e17/proto/ephoto/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- configure.in29 Oct 2006 17:22:16 - 1.12 +++ configure.in3 Dec 2006 22:04:46 - 1.13 @@ -6,6 +6,7 @@ AC_INIT(configure.in) AM_INIT_AUTOMAKE(ephoto, 2.15.0) AM_CONFIG_HEADER(src/config.h) +AM_CONFIG_HEADER(src/bin/config.h) AC_ISC_POSIX AC_PROG_CC @@ -138,6 +139,7 @@ data/Makefile data/images/Makefile src/Makefile +src/bin/Makefile debian/changelog po/Makefile ]) - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Added Files: Makefile.am config.h.in Log Message: Make the src/bin stuff compile now. It is installed as ephoto_test. - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto_gui.c
Log Message:
Whoops. This doesn't go here.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ephoto_gui.c3 Dec 2006 21:51:32 - 1.4
+++ ephoto_gui.c3 Dec 2006 21:52:12 - 1.5
@@ -33,9 +33,7 @@
{
Ewl_Widget *win, *vbox, *image, *text;
- get_files("/home/titan");
-
-win = ewl_window_new();
+ win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "Ephoto!");
ewl_window_name_set(EWL_WINDOW(win), "Ephoto!");
ewl_window_borderless_set(EWL_WINDOW(win));
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.h ephoto_gui.c
Added Files:
ephoto_utils.c
Log Message:
More behind the scenes work.
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto_gui.c2 Dec 2006 19:33:31 - 1.3
+++ ephoto_gui.c3 Dec 2006 21:51:32 - 1.4
@@ -33,6 +33,8 @@
{
Ewl_Widget *win, *vbox, *image, *text;
+ get_files("/home/titan");
+
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "Ephoto!");
ewl_window_name_set(EWL_WINDOW(win), "Ephoto!");
@@ -48,7 +50,7 @@
ewl_widget_show(vbox);
text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), "Version 2.15");
+ ewl_text_text_set(EWL_TEXT(text), VERSION);
ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_LEFT);
ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
ewl_container_child_append(EWL_CONTAINER(vbox), text);
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Modified Files: ephoto.c ephoto_gui.c Log Message: More behind the scenes work. === RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ephoto.c2 Dec 2006 18:39:57 - 1.2 +++ ephoto.c2 Dec 2006 19:33:31 - 1.3 @@ -8,6 +8,7 @@ return 1; } + //ewl_theme_theme_set(PACKAGE_DATA_DIR "/themes/ephoto.edj"); init_gui(); return 0; === RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ephoto_gui.c2 Dec 2006 18:39:57 - 1.2 +++ ephoto_gui.c2 Dec 2006 19:33:31 - 1.3 @@ -38,7 +38,7 @@ ewl_window_name_set(EWL_WINDOW(win), "Ephoto!"); ewl_window_borderless_set(EWL_WINDOW(win)); ewl_widget_state_set(win, "splash", EWL_STATE_PERSISTENT); - ewl_object_size_request(EWL_OBJECT(win), 600, 400); + ewl_object_size_request(EWL_OBJECT(win), 325, 240); ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, destroy, NULL); ewl_widget_show(win); @@ -47,6 +47,13 @@ ewl_container_child_append(EWL_CONTAINER(win), vbox); ewl_widget_show(vbox); + text = ewl_text_new(); + ewl_text_text_set(EWL_TEXT(text), "Version 2.15"); + ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_LEFT); + ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK); + ewl_container_child_append(EWL_CONTAINER(vbox), text); + ewl_widget_show(text); + image = ewl_image_new(); ewl_image_file_set(EWL_IMAGE(image), PACKAGE_DATA_DIR "/images/logo.png", NULL); @@ -55,9 +62,8 @@ ewl_widget_show(image); text = ewl_text_new(); - ewl_text_text_set(EWL_TEXT(text), "Ephoto 2.15 - By Stephen Houston\n" - "Icons by the Tango project \n" - " (http://tango.freedesktop.org)\n"); + ewl_text_text_set(EWL_TEXT(text), " Ephoto\n" + "By Stephen Houston"); ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER); ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK); ewl_container_child_append(EWL_CONTAINER(vbox), text); @@ -167,9 +173,7 @@ Ewl_Widget *win, *atree, *btree, *vbox, *menu_bar, *menu, *nb, *paned; Ewl_Widget *ivbox, *ihbox, *sp, *image, *button; - //ewl_theme_theme_set(PACKAGE_DATA_DIR "/themes/ephoto.edj"); - -win = ewl_window_new(); + win = ewl_window_new(); ewl_window_title_set(EWL_WINDOW(win), "Ephoto!"); ewl_window_name_set(EWL_WINDOW(win), "Ephoto!"); ewl_object_size_request(EWL_OBJECT(win), 600, 400); - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.c ephoto.h ephoto_gui.c
Log Message:
Some more behind the scenes work
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto.c30 Nov 2006 00:03:14 - 1.1
+++ ephoto.c2 Dec 2006 18:39:57 - 1.2
@@ -5,10 +5,10 @@
if (!ewl_init(&argc, argv))
{
printf("Ewl is not usable, please check your installation!\n");
-return;
+return 1;
}
- create_boot();
+ init_gui();
return 0;
}
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto.h30 Nov 2006 00:03:14 - 1.1
+++ ephoto.h2 Dec 2006 18:39:57 - 1.2
@@ -7,7 +7,7 @@
#include
/* Main gui callbacks */
-void create_boot(void);
+void init_gui(void);
/* NLS */
#ifdef ENABLE_NLS
===
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto_gui.c30 Nov 2006 00:03:14 - 1.1
+++ ephoto_gui.c2 Dec 2006 18:39:57 - 1.2
@@ -1,11 +1,12 @@
#include "ephoto.h"
static void destroy(Ewl_Widget *w, void *event, void *data);
-static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt);
static void add_menu_item(Ewl_Widget *c, char *txt, char *img, void *cb);
static void add_button(Ewl_Widget *c, char *txt, char *img, void *cb);
-static Ewl_Widget *add_tree(Ewl_Widget *c);
static void create_main_gui(void);
+static int destroy_boot(void *data);
+static Ewl_Widget *add_menu(Ewl_Widget *c, char *txt);
+static Ewl_Widget *add_tree(Ewl_Widget *c);
static Ewl_Widget *progress;
static Ecore_Timer *timer;
@@ -28,14 +29,16 @@
}
}
-void create_boot(void)
+void init_gui(void)
{
Ewl_Widget *win, *vbox, *image, *text;
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "Ephoto!");
ewl_window_name_set(EWL_WINDOW(win), "Ephoto!");
-ewl_object_size_request(EWL_OBJECT(win), 600, 400);
+ewl_window_borderless_set(EWL_WINDOW(win));
+ ewl_widget_state_set(win, "splash", EWL_STATE_PERSISTENT);
+ ewl_object_size_request(EWL_OBJECT(win), 600, 400);
ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, destroy, NULL);
ewl_widget_show(win);
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Removed Files: config.h Log Message: This file doesn't need to be here. - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Added Files: config.h ephoto.c ephoto.h ephoto_gui.c ephoto_nls.c Log Message: Add test ephoto code into src/bin.Do not use this yet.. and it doesn't compile. - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Log Message: Directory /cvs/e/e17/proto/ephoto/src/bin added to the repository - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/po Added Files: fr.po Log Message: Add fr.po - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto Modified Files: NEWS README TODO Log Message: Include the art in correct places. === RCS file: /cvs/e/e17/proto/ephoto/NEWS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- NEWS9 Sep 2006 03:57:00 - 1.2 +++ NEWS24 Oct 2006 16:25:10 - 1.3 @@ -1 +1,10 @@ -Initial Rewrite! + ___ ___ + / _/ / __ / / / / / / __ / /__ ___/ / __ / + / / / /_/ / / /_/ / / / / // // / / / + / _/ / _/ / __ / / / / // // / / / +/ /_ / / / / / / / /_/ // // /_/ / +/ /__/ /__/ /__/ /___//_//___/ + + +Ephoto now works very nicely. +Sql databasing is almost finished! === RCS file: /cvs/e/e17/proto/ephoto/README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- README 23 Sep 2006 14:19:02 - 1.3 +++ README 24 Oct 2006 16:25:10 - 1.4 @@ -1,3 +1,11 @@ + ___ ___ + / _/ / __ / / / / / / __ / /__ ___/ / __ / + / / / /_/ / / /_/ / / / / // // / / / + / _/ / _/ / __ / / / / // // / / / +/ /_ / / / / / / / /_/ // // /_/ / +/ /__/ /__/ /__/ /___//_//___/ + + Ephoto Image Viewer/Manipulator/Slideshow creator. Icons belong to the tango project (http://tango.freedesktop.org) === RCS file: /cvs/e/e17/proto/ephoto/TODO,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- TODO5 Oct 2006 05:00:42 - 1.10 +++ TODO24 Oct 2006 16:25:10 - 1.11 @@ -1,3 +1,11 @@ + ___ ___ + / _/ / __ / / / / / / __ / /__ ___/ / __ / + / / / /_/ / / /_/ / / / / // // / / / + / _/ / _/ / __ / / / / // // / / / +/ /_ / / / / / / / /_/ // // /_/ / +/ /__/ /__/ /__/ /___//_//___/ + + TODO- ===General=== Multiple Language Support. - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_callbacks.c
Log Message:
More work on adding an album
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ephoto_callbacks.c 24 Oct 2006 15:34:27 - 1.35
+++ ephoto_callbacks.c 24 Oct 2006 16:07:00 - 1.36
@@ -169,7 +169,7 @@
void save_album(Ewl_Widget *w, void *event, void *data)
{
char *title, *description;
- Ewl_Widget *win;
+ Ewl_Widget *win, *hbox, *image, *text, *children[2], *row;
sqlite3 *db;
title = ewl_text_text_get(EWL_TEXT(entry_t));
@@ -178,9 +178,34 @@
db = ephoto_db_init();
ephoto_db_add_album(db, title, description);
ephoto_db_close(db);
+
+ hbox = ewl_hbox_new();
+ ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
+ ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
+ ewl_box_spacing_set(EWL_BOX(hbox), 5);
+ ewl_widget_show(hbox);
+
+ image = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image),
+PACKAGE_DATA_DIR "/images/image.png", NULL);
+ ewl_container_child_append(EWL_CONTAINER(hbox), image);
+ ewl_widget_show(image);
+
+ text = ewl_text_new();
+ ewl_text_text_set(EWL_TEXT(text), title);
+ ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
+ ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
+ ewl_container_child_append(EWL_CONTAINER(hbox), text);
+ ewl_widget_show(text);
+
+ children[0] = hbox;
+ children[1] = NULL;
+
+ row = ewl_tree_row_add(EWL_TREE(m->albums), NULL, children);
win = data;
ewl_widget_destroy(win);
+ ewl_widget_configure(m->albums);
return;
}
@@ -192,7 +217,7 @@
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), _("Add an Album"));
ewl_window_name_set(EWL_WINDOW(win), "Add an Album");
- ewl_object_size_request(EWL_OBJECT(win), 215, 150);
+ ewl_object_size_request(EWL_OBJECT(win), 216, 120);
ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, destroy_album_win, win);
ewl_widget_show(win);
@@ -205,6 +230,7 @@
text = ewl_text_new();
ewl_text_text_set(EWL_TEXT(text), _("Enter the new album name:"));
ewl_container_child_append(EWL_CONTAINER(vbox), text);
+ ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(text);
@@ -217,6 +243,7 @@
ewl_text_text_set(EWL_TEXT(text), _("Enter the new album description:"));
ewl_container_child_append(EWL_CONTAINER(vbox), text);
ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
+ ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
ewl_widget_show(text);
entry_d = ewl_entry_new();
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto.h Log Message: Whoops. This is kind of a huge deal :) === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- ephoto.h16 Oct 2006 12:30:33 - 1.43 +++ ephoto.h24 Oct 2006 15:56:25 - 1.44 @@ -10,6 +10,7 @@ #include #include #include +#include #include "config.h" /* NLS */ @@ -29,10 +30,11 @@ char *sgettext(const char *s); #define S_(str) sgettext(str) +/* Main Window Calls */ void destroy_cb(Ewl_Widget *w, void *event, void *data); void populate_browser(Ewl_Widget *w, void *event, void *data); -void populate_albums(Ewl_Widget *w, void *event, void *data); void populate_images(Ewl_Widget *w, void *event, void *data); +void add_album(Ewl_Widget *w, void *event, void *data); void go_up(Ewl_Widget *w, void *event, void *data); void go_home(Ewl_Widget *w, void *event, void *data); void go_favorites(Ewl_Widget *w, void *event, void *data); @@ -40,6 +42,12 @@ void create_slideshow_config(Ewl_Widget *w, void *event, void *data); void start_slideshow(Ewl_Widget *w, void *event, void *data); void view_images(Ewl_Widget *w, void *event, void *data); + +/* Databasing calls */ +sqlite3 *ephoto_db_init(void); +void ephoto_db_close(sqlite3 *db); +void ephoto_db_add_album(sqlite3 *db, char *name, char *description); +void ephoto_db_list_albums(sqlite3 *db); typedef struct _Main Main; - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto
Modified Files:
configure.in
Log Message:
Add a check for sqlite3 in the configure.in
===
RCS file: /cvs/e/e17/proto/ephoto/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- configure.in15 Oct 2006 22:05:35 - 1.10
+++ configure.in24 Oct 2006 15:51:57 - 1.11
@@ -64,6 +64,13 @@
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)
+
+
PROG="evas-config";
AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)
if test -z "$EVAS_CONFIG" ; then
@@ -134,3 +141,37 @@
debian/changelog
po/Makefile
])
+
+echo
+echo
+echo
+echo ""
+echo "$PACKAGE $VERSION"
+echo ""
+echo
+echo " ___ ___ "
+echo " / _/ / __ / / / / / / __ / /__ ___/ / __ /"
+echo " / / / /_/ / / /_/ / / / / // // / / / "
+echo " / _/ / _/ / __ / / / / // // / / / "
+echo "/ /_ / / / / / / / /_/ // // /_/ / "
+echo "/ /__/ /__/ /__/ /___//_//___/"
+echo
+echo
+echo ""
+echo "$PACKAGE $VERSION"
+echo ""
+echo
+echo "Configuration Options Summary:"
+echo
+echo " Sqlite3 .: Yes"
+echo " Evas : Yes"
+echo " Ecore ...: Yes"
+echo " Edje : Yes"
+echo " Epsilon .: Yes"
+echo " EWL .: Yes"
+echo
+echo "Installation Path.: $prefix"
+echo
+echo "Compilation...: make"
+echo "Installation..: make install"
+echo
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_callbacks.c
Log Message:
Whoops forgot a file.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ephoto_callbacks.c 9 Oct 2006 03:22:36 - 1.34
+++ ephoto_callbacks.c 24 Oct 2006 15:34:27 - 1.35
@@ -1,4 +1,5 @@
#include "ephoto.h"
+Ewl_Widget *entry_t, *entry_d;
void destroy_cb(Ewl_Widget *w, void *event, void *data)
{
@@ -12,60 +13,6 @@
return;
}
-void populate_albums(Ewl_Widget *w, void *event, void *data)
-{
- char *album;
- char *home;
- char path[PATH_MAX];
- char full_path[PATH_MAX];
- Ecore_List *albums;
- Ewl_Widget *hbox;
- Ewl_Widget *image;
- Ewl_Widget *text;
- Ewl_Widget *children[2];
- Ewl_Widget *row;
-
- home = getenv("HOME");
- snprintf(path, PATH_MAX, "%s/.ephoto", home);
-
- if (!ecore_file_exists(path)) ecore_file_mkdir(path);
-
- albums = ecore_list_new();
- albums = ecore_file_ls(path);
-
- while(!ecore_list_is_empty(albums))
- {
- album = ecore_list_remove_first(albums);
- snprintf(full_path, PATH_MAX, "%s/%s", path, album);
-
- hbox = ewl_hbox_new();
- ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
- ewl_box_spacing_set(EWL_BOX(hbox), 5);
- ewl_widget_show(hbox);
-
- image = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image),
-PACKAGE_DATA_DIR "/images/image.png", NULL);
- ewl_container_child_append(EWL_CONTAINER(hbox), image);
- ewl_widget_show(image);
-
- text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), album);
- ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
- ewl_container_child_append(EWL_CONTAINER(hbox), text);
- ewl_widget_show(text);
-
- children[0] = hbox;
- children[1] = NULL;
-
- row = ewl_tree_row_add(EWL_TREE(m->albums), NULL, children);
- ewl_callback_append(row, EWL_CALLBACK_CLICKED, populate_images, NULL);
- ewl_widget_name_set(row, full_path);
- }
-}
-
void populate_browser(Ewl_Widget *w, void *event, void *data)
{
char *directory;
@@ -73,12 +20,8 @@
char full_path[PATH_MAX];
Ecore_List *ls;
Ecore_List *directories;
- Ewl_Widget *hbox;
- Ewl_Widget *image;
- Ewl_Widget *text;
- Ewl_Widget *children[2];
- Ewl_Widget *row;
-
+ Ewl_Widget *hbox, *image, *text, *children[2], *row;
+
directory = data;
current_directory = strdup(directory);
ewl_text_text_set(EWL_TEXT(m->entry), current_directory);
@@ -180,23 +123,6 @@
}
}
}
- else
- {
- ewl_container_reset(EWL_CONTAINER(m->viewer_freebox));
- file_ptr = fopen(dir, "r");
- if (file_ptr != NULL)
- {
- while(fgets(text,PATH_MAX,file_ptr) != NULL)
- {
-if(strncmp(text, "#", 1))
-{
- text[strlen(text)-1] = '\0';
- ecore_list_append(images, strdup(text));
-}
- }
- fclose(file_ptr);
- }
- }
if(!ecore_dlist_is_empty(current_thumbs))
{
ecore_dlist_destroy(current_thumbs);
@@ -231,6 +157,96 @@
ewl_widget_configure(m->viewer);
ecore_list_destroy(ls);
ecore_list_destroy(images);
+}
+
+void destroy_album_win(Ewl_Widget *w, void *event, void *data)
+{
+ Ewl_Widget *win;
+ win = data;
+ ewl_widget_destroy(win);
+}
+
+void save_album(Ewl_Widget *w, void *event, void *data)
+{
+ char *title, *description;
+ Ewl_Widget *win;
+ sqlite3 *db;
+
+ title = ewl_text_text_get(EWL_TEXT(entry_t));
+ description = ewl_text_text_get(EWL_TEXT(entry_d));
+
+ db = ephoto_db_init();
+ ephoto_db_add_album(db, title, description);
+ ephoto_db_close(db);
+
+ win = data;
+ ewl_widget_destroy(win);
+
+ return;
+}
+
+void add_album(Ewl_Widget *w, void *event, void *data)
+{
+ Ewl_Widget *win, *vbox, *hbox, *text, *button;
+
+ win = ewl_window_new();
+ ewl_window_title_set(EWL_WINDOW(win), _("Add an Album"));
+ ewl_window_name_set(EWL_WINDOW(win), "Add an Album");
+ ewl_object_size_request(EWL_OBJECT(win), 215, 150);
+ ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, destroy_album_win, win);
+ ewl_widget_show(win);
+
+ vbox = ewl_vbox_new();
+ ewl_container_child_append(EWL_CONTAINER(win), vbox);
+ ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(vbox), EWL_FLAG_ALIGN_CENTER);
+ ewl_widget_show(vbox);
+
+ text = ewl_text_new();
+ ewl_text_text_set(EWL_TEXT(text), _("Enter the new album name:"));
+ ewl_container_child_append(EWL_CONTAINER(vbox), text);
+ ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
+ ewl_widget_show(text);
+
+ entry_t = ewl_entry_new();
+ ewl_container_child_append(EWL_CONTAINER(vbox), entry_t);
+ ewl_object_alignment_set(EWL_OBJECT(entry_t), EWL_FLAG_ALIGN_CENTER);
+ ewl_widget_show(entry_t);
+
+ text = ewl_text_new();
+ ewl_text
E CVS: proto titan
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 - 1.6
+++ Makefile.am 24 Oct 2006 15:34:05 - 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.c16 Oct 2006 12:30:33 - 1.91
+++ ephoto.c24 Oct 2006 15:34:05 - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto.c Log Message: Fix ephoto === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -3 -r1.89 -r1.90 --- ephoto.c15 Oct 2006 22:34:02 - 1.89 +++ ephoto.c16 Oct 2006 01:26:38 - 1.90 @@ -198,7 +198,6 @@ ewl_object_fill_policy_set(EWL_OBJECT(m->browser), EWL_FLAG_FILL_ALL); ewl_tree_headers_visible_set(EWL_TREE(m->browser), 0); ewl_tree_expandable_rows_set(EWL_TREE(m->browser), FALSE); - ewl_tree_mode_set(EWL_TREE(m->browser), EWL_TREE_MODE_SINGLE); ewl_object_size_request(EWL_OBJECT(m->browser), 220, 250); ewl_widget_show(m->browser); @@ -222,7 +221,6 @@ ewl_object_fill_policy_set(EWL_OBJECT(m->albums), EWL_FLAG_FILL_ALL); ewl_tree_headers_visible_set(EWL_TREE(m->albums), 0); ewl_tree_expandable_rows_set(EWL_TREE(m->albums), FALSE); - ewl_tree_mode_set(EWL_TREE(m->albums), EWL_TREE_MODE_SINGLE); ewl_object_size_request(EWL_OBJECT(m->albums), 220, 250); ewl_widget_show(m->albums); - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/data/images
Modified Files:
image_bg.edc
Log Message:
Formatting
===
RCS file: /cvs/e/e17/proto/ephoto/data/images/image_bg.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- image_bg.edc9 Oct 2006 03:22:36 - 1.1
+++ image_bg.edc14 Oct 2006 17:28:06 - 1.2
@@ -1,25 +1,25 @@
collections {
-group {
-name, "image_bg";
+ group {
+ name, "image_bg";
-parts {
- part {
- name, "background";
- mouse_events, 0;
- type: RECT;
- description {
+ parts {
+ part {
+name, "background";
+mouse_events, 0;
+type: RECT;
+description {
state, "default" 0.0;
rel1 {
- relative: 0.0 0.0;
- offset: 11;
+ relative: 0.0 0.0;
+ offset: 11;
}
rel2 {
- relative: 1.0 1.0;
- offset: -2 -2;
+ relative: 1.0 1.0;
+ offset: -2 -2;
}
color: 255 255 255 255;
- }
- }
+}
+ }
+ }
}
-}
}
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto.c ephoto_callbacks.c ephoto_viewer.c Log Message: Finish moving ephoto to ewl_shadow === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v retrieving revision 1.86 retrieving revision 1.87 diff -u -3 -r1.86 -r1.87 --- ephoto.c7 Oct 2006 18:08:46 - 1.86 +++ ephoto.c9 Oct 2006 03:22:36 - 1.87 @@ -29,7 +29,7 @@ m->win = ewl_window_new(); ewl_window_title_set(EWL_WINDOW(m->win), "Ephoto"); ewl_window_name_set(EWL_WINDOW(m->win), "Ephoto"); - ewl_object_size_request(EWL_OBJECT(m->win), 620, 480); + ewl_object_size_request(EWL_OBJECT(m->win), 620, 475); ewl_callback_append(m->win, EWL_CALLBACK_DELETE_WINDOW, destroy_cb, NULL); ewl_widget_show(m->win); === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- ephoto_callbacks.c 7 Oct 2006 21:15:45 - 1.33 +++ ephoto_callbacks.c 9 Oct 2006 03:22:36 - 1.34 @@ -209,8 +209,8 @@ shadow = ewl_shadow_new(); ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), shadow); - ewl_object_minimum_size_set(EWL_OBJECT(shadow), 115, 95); - ewl_object_maximum_size_set(EWL_OBJECT(shadow), 115, 95); + ewl_object_minimum_size_set(EWL_OBJECT(shadow), 110, 90); + ewl_object_maximum_size_set(EWL_OBJECT(shadow), 110, 90); ewl_callback_append(shadow, EWL_CALLBACK_CLICKED, view_images, image_path); ewl_widget_show(shadow); @@ -219,8 +219,9 @@ ewl_container_child_append(EWL_CONTAINER(shadow), image); ewl_image_size_set(EWL_IMAGE(image), 97, 83); ewl_image_proportional_set(EWL_IMAGE(image), TRUE); - ewl_theme_data_str_set(image, "/image_thumbnail/group", - ewl_theme_data_str_get(m->win, "group")); + ewl_theme_data_str_set(image, "/image_thumbnail/file", + PACKAGE_DATA_DIR "/images/image_bg.edj"); + ewl_theme_data_str_set(image, "/image_thumbnail/group", "image_bg"); ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image); } === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ephoto_viewer.c 7 Oct 2006 21:15:45 - 1.20 +++ ephoto_viewer.c 9 Oct 2006 03:22:36 - 1.21 @@ -461,7 +461,7 @@ shadow = ewl_shadow_new(); ewl_container_child_append(EWL_CONTAINER(freebox), shadow); ewl_object_minimum_size_set(EWL_OBJECT(shadow), 60, 60); - ewl_object_maximum_size_set(EWL_OBJECT(shadow), 60, 60); + ewl_object_maximum_size_set(EWL_OBJECT(shadow), 55, 55); ewl_callback_append(shadow, EWL_CALLBACK_CLICKED, change_image, current_image); ewl_widget_show(shadow); @@ -471,8 +471,9 @@ ewl_image_size_set(EWL_IMAGE(image), 48, 48); ewl_image_proportional_set(EWL_IMAGE(image), TRUE); ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); - ewl_theme_data_str_set(image, "/image_thumbnail/group", -ewl_theme_data_str_get(m->win, "group")); + ewl_theme_data_str_set(image, "/image_thumbnail/file", +PACKAGE_DATA_DIR "/images/image_bg.edj"); + ewl_theme_data_str_set(image, "/image_thumbnail/group", "image_bg"); ewl_widget_show(image); ecore_dlist_next(view_thumbs); - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/data/images
Modified Files:
Makefile.am
Added Files:
image_bg.edc
Log Message:
Finish moving ephoto to ewl_shadow
===
RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 6 Oct 2006 02:25:11 - 1.8
+++ Makefile.am 9 Oct 2006 03:22:36 - 1.9
@@ -1,4 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
+
+EDCS = image_bg.edc
+
+EDJS = $(EDCS:%.edc=%.edj)
+
FILES = add.png \
dialog-close.png \
emblem-favorite.png \
@@ -18,5 +23,12 @@
undo.png \
x-office-presentation.png
imagedir = $(pkgdatadir)/images
+edjedir = $(pkgdatadir)/images
+edje_DATA = $(EDJS)
+all: $(EDJS)
+image_bg.edj: ${EDCS}
+SUFFIXES = .edc .edj
+.edc.edj:
+ edje_cc image_bg.edc image_bg.edj
image_DATA = $(FILES)
EXTRA_DIST = $(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.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_callbacks.c ephoto_viewer.c
Log Message:
Make the viewer use shadow as well. Fix a callback naming issue.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ephoto_callbacks.c 7 Oct 2006 18:08:47 - 1.32
+++ ephoto_callbacks.c 7 Oct 2006 21:15:45 - 1.33
@@ -142,7 +142,7 @@
Ecore_List *ls;
Ecore_List *images;
Ewl_Widget *image;
- Ewl_Widget *cell;
+ Ewl_Widget *shadow;
ls = ecore_list_new();
images = ecore_list_new();
@@ -207,16 +207,16 @@
image_path = ecore_list_remove_first(images);
ecore_dlist_append(current_thumbs, image_path);
- cell = ewl_shadow_new();
- ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), cell);
- ewl_object_minimum_size_set(EWL_OBJECT(cell), 115, 95);
- ewl_object_maximum_size_set(EWL_OBJECT(cell), 115, 95);
- ewl_callback_append(cell, EWL_CALLBACK_CLICKED, view_images, image_path);
- ewl_widget_show(cell);
+ shadow = ewl_shadow_new();
+ ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), shadow);
+ ewl_object_minimum_size_set(EWL_OBJECT(shadow), 115, 95);
+ ewl_object_maximum_size_set(EWL_OBJECT(shadow), 115, 95);
+ ewl_callback_append(shadow, EWL_CALLBACK_CLICKED, view_images, image_path);
+ ewl_widget_show(shadow);
image = ewl_image_thumbnail_new();
ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(image), image_path);
- ewl_container_child_append(EWL_CONTAINER(cell), image);
+ ewl_container_child_append(EWL_CONTAINER(shadow), image);
ewl_image_size_set(EWL_IMAGE(image), 97, 83);
ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
ewl_theme_data_str_set(image, "/image_thumbnail/group",
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ephoto_viewer.c 6 Oct 2006 22:23:04 - 1.19
+++ ephoto_viewer.c 7 Oct 2006 21:15:45 - 1.20
@@ -218,8 +218,8 @@
void view_images(Ewl_Widget *w, void *event, void *data)
{
char *current_image;
- Ewl_Widget *button, *vbox, *scrollpane, *freebox, *icon;
- Ewl_Widget *image, *hbox, *cell, *menubar, *menu, *menu_item;
+ Ewl_Widget *button, *vbox, *scrollpane, *freebox, *image;
+ Ewl_Widget *hbox, *shadow, *menubar, *menu, *menu_item;
Ecore_List *view_thumbs;
view_thumbs = current_thumbs;
@@ -317,7 +317,7 @@
ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom 1:1"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
- ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, zoom_out, NULL);
+ ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, original_size, NULL);
ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
ewl_widget_show(menu_item);
@@ -458,21 +458,21 @@
{
current_image = ecore_dlist_current(view_thumbs);
- cell = ewl_cell_new();
- ewl_container_child_append(EWL_CONTAINER(freebox), cell);
- ewl_object_minimum_size_set(EWL_OBJECT(cell), 50, 50);
- ewl_object_maximum_size_set(EWL_OBJECT(cell), 50, 50);
- ewl_theme_data_str_set(cell, "/cell/group",
- ewl_theme_data_str_get(m->entry, "group"));
- ewl_callback_append(cell, EWL_CALLBACK_CLICKED, change_image, current_image);
- ewl_widget_show(cell);
+ shadow = ewl_shadow_new();
+ ewl_container_child_append(EWL_CONTAINER(freebox), shadow);
+ ewl_object_minimum_size_set(EWL_OBJECT(shadow), 60, 60);
+ ewl_object_maximum_size_set(EWL_OBJECT(shadow), 60, 60);
+ ewl_callback_append(shadow, EWL_CALLBACK_CLICKED, change_image,
current_image);
+ ewl_widget_show(shadow);
image = ewl_image_thumbnail_new();
ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(image), current_image);
- ewl_container_child_append(EWL_CONTAINER(cell), image);
+ ewl_container_child_append(EWL_CONTAINER(shadow), image);
ewl_image_size_set(EWL_IMAGE(image), 48, 48);
ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
+ ewl_theme_data_str_set(image, "/image_thumbnail/group",
+ewl_theme_data_str_get(m->win, "group"));
ewl_widget_show(image);
ecore_dlist_next(view_thumbs);
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto.c ephoto_callbacks.c Log Message: Move ephoto's thumb viewer to use ewl_shadow === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -3 -r1.85 -r1.86 --- ephoto.c6 Oct 2006 02:22:53 - 1.85 +++ ephoto.c7 Oct 2006 18:08:46 - 1.86 @@ -29,7 +29,7 @@ m->win = ewl_window_new(); ewl_window_title_set(EWL_WINDOW(m->win), "Ephoto"); ewl_window_name_set(EWL_WINDOW(m->win), "Ephoto"); - ewl_object_size_request(EWL_OBJECT(m->win), 580, 460); + ewl_object_size_request(EWL_OBJECT(m->win), 620, 480); ewl_callback_append(m->win, EWL_CALLBACK_DELETE_WINDOW, destroy_cb, NULL); ewl_widget_show(m->win); === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- ephoto_callbacks.c 3 Oct 2006 01:50:29 - 1.31 +++ ephoto_callbacks.c 7 Oct 2006 18:08:47 - 1.32 @@ -207,12 +207,10 @@ image_path = ecore_list_remove_first(images); ecore_dlist_append(current_thumbs, image_path); - cell = ewl_cell_new(); + cell = ewl_shadow_new(); ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), cell); - ewl_object_minimum_size_set(EWL_OBJECT(cell), 100, 85); - ewl_object_maximum_size_set(EWL_OBJECT(cell), 100, 85); - ewl_theme_data_str_set(cell, "/cell/group", -ewl_theme_data_str_get(m->entry, "group")); + ewl_object_minimum_size_set(EWL_OBJECT(cell), 115, 95); + ewl_object_maximum_size_set(EWL_OBJECT(cell), 115, 95); ewl_callback_append(cell, EWL_CALLBACK_CLICKED, view_images, image_path); ewl_widget_show(cell); @@ -221,6 +219,8 @@ ewl_container_child_append(EWL_CONTAINER(cell), image); ewl_image_size_set(EWL_IMAGE(image), 97, 83); ewl_image_proportional_set(EWL_IMAGE(image), TRUE); + ewl_theme_data_str_set(image, "/image_thumbnail/group", + ewl_theme_data_str_get(m->win, "group")); ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image); } - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_viewer.c
Log Message:
Get the much desired zoom to fit option into cvs.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ephoto_viewer.c 6 Oct 2006 21:50:02 - 1.18
+++ ephoto_viewer.c 6 Oct 2006 22:23:04 - 1.19
@@ -26,6 +26,7 @@
ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(image_view);
+ ewl_widget_configure(image_view);
ewl_widget_configure(ibox);
}
@@ -44,13 +45,25 @@
{
int ow, oh;
- ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
+ ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
ewl_image_size_set(EWL_IMAGE(image_view), ow/2, oh/2);
ewl_widget_configure(ibox);
}
+void zoom_fit(Ewl_Widget *w, void *event, void *data)
+{
+ int ew, eh;
+
+ ewl_object_current_size_get(EWL_OBJECT(ibox), &ew, &eh);
+
+ ewl_image_proportional_set(EWL_IMAGE(image_view), FALSE);
+ ewl_image_size_set(EWL_IMAGE(image_view), ew-16, eh-16);
+
+ ewl_widget_configure(ibox);
+}
+
void original_size(Ewl_Widget *w, void *event, void *data)
{
const char *path;
@@ -290,6 +303,16 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
+ PACKAGE_DATA_DIR "/images/search.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom To Fit"));
+ ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
+ ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, zoom_fit, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
+ ewl_widget_show(menu_item);
+
+ menu_item = ewl_menu_item_new();
+ ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/search.png", NULL);
ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom 1:1"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
@@ -390,6 +413,16 @@
ewl_callback_append(button, EWL_CALLBACK_CLICKED, zoom_out, image_view);
ewl_widget_show(button);
+ button = ewl_button_new();
+ ewl_button_image_set(EWL_BUTTON(button),
+PACKAGE_DATA_DIR "/images/search.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(button), "Fit");
+ ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(hbox), button);
+ ewl_callback_append(button, EWL_CALLBACK_CLICKED, zoom_fit, image_view);
+ ewl_widget_show(button);
+
button = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(button),
PACKAGE_DATA_DIR "/images/search.png", NULL);
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_slideshow.c ephoto_viewer.c
Log Message:
Update gettext calls.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ephoto_slideshow.c 6 Oct 2006 02:22:53 - 1.18
+++ ephoto_slideshow.c 6 Oct 2006 21:50:02 - 1.19
@@ -490,7 +490,7 @@
save = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(save),
PACKAGE_DATA_DIR "/images/stock_save.png", NULL);
- ewl_button_label_set(EWL_BUTTON(save), "save");
+ ewl_button_label_set(EWL_BUTTON(save), gettext("save"));
ewl_container_child_append(EWL_CONTAINER(hbox), save);
ewl_object_fill_policy_set(EWL_OBJECT(save), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(save), EWL_FLAG_ALIGN_CENTER);
@@ -500,7 +500,7 @@
cancel = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(cancel),
PACKAGE_DATA_DIR "/images/dialog-close.png", NULL);
- ewl_button_label_set(EWL_BUTTON(cancel), "cancel");
+ ewl_button_label_set(EWL_BUTTON(cancel), gettext("cancel"));
ewl_container_child_append(EWL_CONTAINER(hbox), cancel);
ewl_object_fill_policy_set(EWL_OBJECT(cancel), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(cancel), EWL_FLAG_ALIGN_CENTER);
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ephoto_viewer.c 6 Oct 2006 21:45:21 - 1.17
+++ ephoto_viewer.c 6 Oct 2006 21:50:02 - 1.18
@@ -237,7 +237,7 @@
ewl_widget_show(menubar);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), "File");
+ ewl_button_label_set(EWL_BUTTON(menu), gettext("File"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -245,7 +245,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/stock_save.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Save Image");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Save Image"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
//ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, destroy_vwin, NULL);
@@ -255,7 +255,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/exit.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Exit");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Exit"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, destroy_vwin, vwin);
@@ -263,7 +263,7 @@
ewl_widget_show(menu_item);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), "Actions");
+ ewl_button_label_set(EWL_BUTTON(menu), gettext("Actions"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -271,7 +271,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Zoom In");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom In"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, zoom_in, NULL);
@@ -281,7 +281,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Zoom Out");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom Out"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, zoom_out, NULL);
@@ -291,7 +291,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Zoom 1:1");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom 1:1"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLIC
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto Modified Files: AUTHORS Log Message: New ascii art from pfritz === RCS file: /cvs/e/e17/proto/ephoto/AUTHORS,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- AUTHORS 29 Sep 2006 02:27:11 - 1.5 +++ AUTHORS 6 Oct 2006 21:45:16 - 1.6 @@ -1,11 +1,9 @@ -= -| = = == == == ==| -| | | | || = = |_ _| = = | -| = |===| || == || == | -| | | || = =||= = | -| = | || == || ==| -= - + ___ ___ + / _/ / __ / / / / / / __ / /__ ___/ / __ / + / / / /_/ / / /_/ / / / / // // / / / + / _/ / _/ / __ / / / / // // / / / +/ /_ / / / / / / / /_/ // // /_/ / +/ /__/ /__/ /__/ /___//_//___/ ===Project Manager/Lead Developer=== Stephen "LinuxTitan" Houston <[EMAIL PROTECTED]> - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_viewer.c
Log Message:
New ascii art from pfritz
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ephoto_viewer.c 6 Oct 2006 02:25:11 - 1.16
+++ ephoto_viewer.c 6 Oct 2006 21:45:21 - 1.17
@@ -5,7 +5,9 @@
void destroy_vwin(Ewl_Widget *w, void *event, void *data)
{
- ewl_widget_destroy(w);
+ Ewl_Widget *win;
+ win = data;
+ ewl_widget_destroy(win);
}
void change_image(Ewl_Widget *w, void *event, void *data)
@@ -220,7 +222,7 @@
ewl_window_title_set(EWL_WINDOW(vwin), gettext("Ephoto Image Viewer"));
ewl_window_name_set(EWL_WINDOW(vwin), "Ephoto Image Viewer");
ewl_object_size_request(EWL_OBJECT(vwin), 480, 480);
- ewl_callback_append(vwin, EWL_CALLBACK_DELETE_WINDOW, destroy_vwin, NULL);
+ ewl_callback_append(vwin, EWL_CALLBACK_DELETE_WINDOW, destroy_vwin, vwin);
ewl_widget_show(vwin);
vbox = ewl_vbox_new();
@@ -256,7 +258,7 @@
ewl_button_label_set(EWL_BUTTON(menu_item), "Exit");
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
- ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, destroy_vwin, NULL);
+ ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, destroy_vwin, vwin);
ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
ewl_widget_show(menu_item);
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/data/images Modified Files: Makefile.am Added Files: go-down.png go-next.png Log Message: Add a menu to the image viewer. Also add flip horizontal and flip horizontal functions. === RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Makefile.am 5 Oct 2006 23:08:44 - 1.7 +++ Makefile.am 6 Oct 2006 02:25:11 - 1.8 @@ -7,6 +7,8 @@ folder.png \ go-up.png \ go-home.png \ + go-down.png \ + go-next.png \ image.png \ preferences-system.png \ redo.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.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
config.h.in ephoto_viewer.c
Log Message:
Add a menu to the image viewer. Also add flip horizontal and flip horizontal
functions.
===
RCS file: /cvs/e/e17/proto/ephoto/src/config.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- config.h.in 6 Oct 2006 02:22:53 - 1.3
+++ config.h.in 6 Oct 2006 02:25:11 - 1.4
@@ -4,6 +4,14 @@
language is requested. */
#undef ENABLE_NLS
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#undef HAVE_DCGETTEXT
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ephoto_viewer.c 6 Oct 2006 02:22:53 - 1.15
+++ ephoto_viewer.c 6 Oct 2006 02:25:11 - 1.16
@@ -68,6 +68,68 @@
ewl_widget_configure(ibox);
}
+void flip_horizontal(Ewl_Widget *w, void *event, void *data)
+{
+ unsigned int *im_data, *im_data_new;
+ int index, ind, i, j, ni, nj, ew, eh;
+
+ im_data = evas_object_image_data_get(EWL_IMAGE(image_view)->image, FALSE);
+ evas_object_image_size_get(EWL_IMAGE(image_view)->image, &ew, &eh);
+ index = 0;
+
+ im_data_new = malloc(sizeof(unsigned int) * ew * eh);
+
+ for (i = 0; i < eh; i++)
+ {
+ for (j = 0; j < ew; j++)
+ {
+ ni = i;
+ nj = ew - j - 1;
+
+ ind = ni * ew + nj;
+ im_data_new[index] = im_data[ind];
+ index++;
+ }
+ }
+
+ evas_object_image_size_set(EWL_IMAGE(image_view)->image, ew, eh);
+ evas_object_image_data_set(EWL_IMAGE(image_view)->image, im_data_new);
+ evas_object_image_data_update_add(EWL_IMAGE(image_view)->image, 0, 0, ew, eh);
+ ewl_widget_configure(image_view);
+ ewl_widget_configure(ibox);
+}
+
+void flip_vertical(Ewl_Widget *w, void *event, void *data)
+{
+ unsigned int *im_data, *im_data_new;
+ int index, ind, i, j, ni, nj, ew, eh;
+
+ im_data = evas_object_image_data_get(EWL_IMAGE(image_view)->image, FALSE);
+ evas_object_image_size_get(EWL_IMAGE(image_view)->image, &ew, &eh);
+ index = 0;
+
+ im_data_new = malloc(sizeof(unsigned int) * ew * eh);
+
+ for (i = 0; i < eh; i++)
+ {
+ for (j = 0; j < ew; j++)
+ {
+ ni = eh - i - 1;
+ nj = j;
+
+ ind = ni * ew + nj;
+ im_data_new[index] = im_data[ind];
+ index++;
+ }
+ }
+
+ evas_object_image_size_set(EWL_IMAGE(image_view)->image, ew, eh);
+ evas_object_image_data_set(EWL_IMAGE(image_view)->image, im_data_new);
+ evas_object_image_data_update_add(EWL_IMAGE(image_view)->image, 0, 0, ew, eh);
+ ewl_widget_configure(image_view);
+ ewl_widget_configure(ibox);
+}
+
void rotate_left(Ewl_Widget *w, void *event, void *data)
{
unsigned int *im_data, *im_data_new;
@@ -141,14 +203,8 @@
void view_images(Ewl_Widget *w, void *event, void *data)
{
char *current_image;
- Ewl_Widget *button;
- Ewl_Widget *vbox;
- Ewl_Widget *scrollpane;
- Ewl_Widget *freebox;
- Ewl_Widget *icon;
- Ewl_Widget *image;
- Ewl_Widget *hbox;
- Ewl_Widget *cell;
+ Ewl_Widget *button, *vbox, *scrollpane, *freebox, *icon;
+ Ewl_Widget *image, *hbox, *cell, *menubar, *menu, *menu_item;
Ecore_List *view_thumbs;
view_thumbs = current_thumbs;
@@ -172,7 +228,114 @@
ewl_container_child_append(EWL_CONTAINER(vwin), vbox);
ewl_box_spacing_set(EWL_BOX(vbox), 10);
ewl_widget_show(vbox);
-
+
+ menubar = ewl_hmenubar_new();
+ ewl_container_child_append(EWL_CONTAINER(vbox), menubar);
+ ewl_object_fill_policy_set(EWL_OBJECT(menubar), EWL_FLAG_FILL_HFILL);
+ ewl_widget_show(menubar);
+
+ menu = ewl_menu_new();
+ ewl_button_label_set(EWL_BUTTON(menu), "File");
+ ewl_container_child_append(EWL_CONTAINER(menubar), menu);
+ ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
+ ewl_widget_show(menu);
+
+ menu_item = ewl_menu_item_new();
+ ewl_button_image_set(EWL_BUTTON(menu_item),
+ PACKAGE_DATA_DIR "/images/stock_save.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(menu_item), "Save Image");
+ ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
+ //ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, destroy_vwin, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
+ ewl_widget_show(menu_item);
+
+ menu_item = ewl_menu_item_new();
+ ewl_button_image_set(EWL_BUTTON(menu_item),
+ PACKAGE_DATA_DIR "/images/exit.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(menu_item), "Exit");
+ ewl_objec
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/data/images Modified Files: Makefile.am Added Files: dialog-close.png stock_save.png Log Message: Add the images that the configure dialog uses into ephoto. === RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 30 Sep 2006 21:26:29 - 1.6 +++ Makefile.am 5 Oct 2006 23:08:44 - 1.7 @@ -1,6 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in FILES = add.png \ - emblem-favorite.png \ + dialog-close.png \ +emblem-favorite.png \ emblem-photos.png \ exit.png \ folder.png \ @@ -11,6 +12,7 @@ redo.png \ remove.png \ search.png \ +stock_save.png \ undo.png \ x-office-presentation.png imagedir = $(pkgdatadir)/images - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_slideshow.c Log Message: Add the images that the configure dialog uses into ephoto. === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- ephoto_slideshow.c 30 Sep 2006 19:38:07 - 1.16 +++ ephoto_slideshow.c 5 Oct 2006 23:08:45 - 1.17 @@ -488,7 +488,9 @@ ewl_widget_show(hbox); save = ewl_button_new(); - ewl_button_stock_type_set(EWL_BUTTON(save), EWL_STOCK_SAVE); + ewl_button_image_set(EWL_BUTTON(save), + PACKAGE_DATA_DIR "/images/stock_save.png", NULL); + ewl_button_label_set(EWL_BUTTON(save), "save"); ewl_container_child_append(EWL_CONTAINER(hbox), save); ewl_object_fill_policy_set(EWL_OBJECT(save), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(save), EWL_FLAG_ALIGN_CENTER); @@ -496,7 +498,9 @@ ewl_widget_show(save); cancel = ewl_button_new(); - ewl_button_stock_type_set(EWL_BUTTON(cancel), EWL_STOCK_CANCEL); + ewl_button_image_set(EWL_BUTTON(cancel), + PACKAGE_DATA_DIR "/images/dialog-close.png", NULL); + ewl_button_label_set(EWL_BUTTON(cancel), "cancel"); ewl_container_child_append(EWL_CONTAINER(hbox), cancel); ewl_object_fill_policy_set(EWL_OBJECT(cancel), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(cancel), EWL_FLAG_ALIGN_CENTER); - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto Modified Files: TODO Log Message: Updated TODO! === RCS file: /cvs/e/e17/proto/ephoto/TODO,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- TODO19 Sep 2006 01:00:27 - 1.9 +++ TODO5 Oct 2006 05:00:42 - 1.10 @@ -1,7 +1,10 @@ TODO- -Add image manipulation. +===General=== +Multiple Language Support. +SQL Databasing and Album work. +===Image Viewer=== +Add Adjust controls(Blur/Sharpen/Histogram). +===Slideshow=== Add audio. Add transitions(fade). -Add sql databasing. Add edje widgets for images to create ken burns effect? -Album work. - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_viewer.c
Log Message:
Ephoto's rotations are now functional and work! Yay :)
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto_viewer.c 3 Oct 2006 01:50:29 - 1.13
+++ ephoto_viewer.c 5 Oct 2006 03:36:35 - 1.14
@@ -34,8 +34,7 @@
ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
ewl_image_size_set(EWL_IMAGE(image_view), ow*2, oh*2);
- ewl_widget_reparent(image_view);
-
+
ewl_widget_configure(ibox);
}
@@ -46,8 +45,7 @@
ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
ewl_image_size_set(EWL_IMAGE(image_view), ow/2, oh/2);
- ewl_widget_reparent(image_view);
-
+
ewl_widget_configure(ibox);
}
@@ -70,6 +68,76 @@
ewl_widget_configure(ibox);
}
+void rotate_left(Ewl_Widget *w, void *event, void *data)
+{
+ unsigned int *im_data, *im_data_new;
+ int index, ind, i, j, ni, nj, ew, eh, nw, nh;
+
+ im_data = evas_object_image_data_get(EWL_IMAGE(image_view)->image, FALSE);
+ evas_object_image_size_get(EWL_IMAGE(image_view)->image, &ew, &eh);
+ index = 0;
+
+ im_data_new = malloc(sizeof(unsigned int) * ew * eh);
+
+ nw = eh;
+ nh = ew;
+
+ for (i = 0; i < nh; i++)
+ {
+ for (j = 0; j < nw; j++)
+ {
+ ni = j;
+ nj = nh - i - 1;
+
+ ind = ni * nh + nj;
+
+ im_data_new[index] = im_data[ind];
+ index++;
+ }
+ }
+
+ evas_object_image_size_set(EWL_IMAGE(image_view)->image, nw, nh);
+ evas_object_image_data_set(EWL_IMAGE(image_view)->image, im_data_new);
+ evas_object_image_data_update_add(EWL_IMAGE(image_view)->image, 0, 0, nw, nh);
+ ewl_widget_configure(image_view);
+ ewl_widget_configure(ibox);
+}
+
+void rotate_right(Ewl_Widget *w, void *event, void *data)
+{
+ unsigned int *im_data, *im_data_new;
+ int index, ind, i, j, ni, nj, ew, eh, nw, nh;
+
+ im_data = evas_object_image_data_get(EWL_IMAGE(image_view)->image, FALSE);
+ evas_object_image_size_get(EWL_IMAGE(image_view)->image, &ew, &eh);
+ index = 0;
+
+ im_data_new = malloc(sizeof(unsigned int) * ew * eh);
+
+ nw = eh;
+ nh = ew;
+
+ for (i = 0; i < nh; i++)
+ {
+ for (j = 0; j < nw; j++)
+ {
+ ni = nw - j - 1;
+ nj = i;
+
+ ind = ni * nh + nj;
+
+ im_data_new[index] = im_data[ind];
+ index++;
+ }
+ }
+
+ evas_object_image_size_set(EWL_IMAGE(image_view)->image, nw, nh);
+ evas_object_image_data_set(EWL_IMAGE(image_view)->image, im_data_new);
+ evas_object_image_data_update_add(EWL_IMAGE(image_view)->image, 0, 0, nw, nh);
+ ewl_widget_configure(image_view);
+ ewl_widget_configure(ibox);
+}
+
void view_images(Ewl_Widget *w, void *event, void *data)
{
char *current_image;
@@ -174,6 +242,7 @@
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
+ ewl_callback_append(button, EWL_CALLBACK_CLICKED, rotate_left, NULL);
ewl_widget_show(button);
button = ewl_button_new();
@@ -183,6 +252,7 @@
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
+ ewl_callback_append(button, EWL_CALLBACK_CLICKED, rotate_right, NULL);
ewl_widget_show(button);
ecore_dlist_goto_first(view_thumbs);
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_callbacks.c ephoto_viewer.c Log Message: More correct zoom === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- ephoto_callbacks.c 1 Oct 2006 00:38:45 - 1.30 +++ ephoto_callbacks.c 3 Oct 2006 01:50:29 - 1.31 @@ -64,7 +64,6 @@ ewl_callback_append(row, EWL_CALLBACK_CLICKED, populate_images, NULL); ewl_widget_name_set(row, full_path); } - ewl_widget_configure(m->albums); } void populate_browser(Ewl_Widget *w, void *event, void *data) @@ -131,7 +130,6 @@ ewl_callback_append(row, EWL_CALLBACK_CLICKED, populate_images, NULL); ewl_widget_name_set(row, file); } - ewl_widget_configure(m->browser); } void populate_images(Ewl_Widget *w, void *event, void *data) @@ -226,6 +224,8 @@ ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image); } + ewl_widget_configure(m->albums); + ewl_widget_configure(m->browser); ewl_widget_configure(m->viewer_freebox); ewl_widget_configure(m->viewer); ecore_list_destroy(ls); === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ephoto_viewer.c 1 Oct 2006 05:31:58 - 1.12 +++ ephoto_viewer.c 3 Oct 2006 01:50:29 - 1.13 @@ -33,7 +33,7 @@ ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh); - ewl_image_size_set(EWL_IMAGE(image_view), ow*1.5, oh*1.5); + ewl_image_size_set(EWL_IMAGE(image_view), ow*2, oh*2); ewl_widget_reparent(image_view); ewl_widget_configure(ibox); @@ -45,7 +45,7 @@ ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh); - ewl_image_size_set(EWL_IMAGE(image_view), ow/1.5, oh/1.5); + ewl_image_size_set(EWL_IMAGE(image_view), ow/2, oh/2); ewl_widget_reparent(image_view); ewl_widget_configure(ibox); - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_viewer.c Log Message: Center images in the image viewer. === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ephoto_viewer.c 1 Oct 2006 00:31:06 - 1.11 +++ ephoto_viewer.c 1 Oct 2006 05:31:58 - 1.12 @@ -21,7 +21,7 @@ ewl_container_child_append(EWL_CONTAINER(ibox), image_view); ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE); ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); - ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT); + ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image_view); ewl_widget_configure(ibox); @@ -64,7 +64,7 @@ ewl_container_child_append(EWL_CONTAINER(ibox), image_view); ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE); ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); - ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT); + ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image_view); ewl_widget_configure(ibox); @@ -128,7 +128,7 @@ ewl_container_child_append(EWL_CONTAINER(ibox), image_view); ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE); ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); - ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT); + ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image_view); hbox = ewl_hbox_new(); - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_callbacks.c Log Message: A few more bug fixes on ephoto === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- ephoto_callbacks.c 24 Sep 2006 23:30:19 - 1.29 +++ ephoto_callbacks.c 1 Oct 2006 00:38:45 - 1.30 @@ -64,6 +64,7 @@ ewl_callback_append(row, EWL_CALLBACK_CLICKED, populate_images, NULL); ewl_widget_name_set(row, full_path); } + ewl_widget_configure(m->albums); } void populate_browser(Ewl_Widget *w, void *event, void *data) @@ -130,6 +131,7 @@ ewl_callback_append(row, EWL_CALLBACK_CLICKED, populate_images, NULL); ewl_widget_name_set(row, file); } + ewl_widget_configure(m->browser); } void populate_images(Ewl_Widget *w, void *event, void *data) @@ -224,6 +226,8 @@ ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image); } + ewl_widget_configure(m->viewer_freebox); + ewl_widget_configure(m->viewer); ecore_list_destroy(ls); ecore_list_destroy(images); } - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_viewer.c Log Message: Fix one of the issues === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ephoto_viewer.c 1 Oct 2006 00:26:15 - 1.10 +++ ephoto_viewer.c 1 Oct 2006 00:31:06 - 1.11 @@ -23,6 +23,8 @@ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT); ewl_widget_show(image_view); + + ewl_widget_configure(ibox); } void zoom_in(Ewl_Widget *w, void *event, void *data) @@ -33,6 +35,8 @@ ewl_image_size_set(EWL_IMAGE(image_view), ow*1.5, oh*1.5); ewl_widget_reparent(image_view); + + ewl_widget_configure(ibox); } void zoom_out(Ewl_Widget *w, void *event, void *data) @@ -43,6 +47,8 @@ ewl_image_size_set(EWL_IMAGE(image_view), ow/1.5, oh/1.5); ewl_widget_reparent(image_view); + + ewl_widget_configure(ibox); } void original_size(Ewl_Widget *w, void *event, void *data) @@ -60,6 +66,8 @@ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT); ewl_widget_show(image_view); + + ewl_widget_configure(ibox); } void view_images(Ewl_Widget *w, void *event, void *data) - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_viewer.c
Log Message:
Much better zooming. Much less buggy.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ephoto_viewer.c 1 Oct 2006 00:05:41 - 1.9
+++ ephoto_viewer.c 1 Oct 2006 00:26:15 - 1.10
@@ -1,6 +1,5 @@
#include "ephoto.h"
Ewl_Widget *vwin;
-Ewl_Widget *vbox;
Ewl_Widget *ibox;
Ewl_Widget *image_view;
@@ -15,76 +14,35 @@
path = data;
- ewl_widget_destroy(ibox);
ewl_widget_destroy(image_view);
- ibox = ewl_scrollpane_new();
- ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
- ewl_widget_show(ibox);
-
image_view = ewl_image_new();
ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
- ewl_widget_show(image_view);
+ ewl_widget_show(image_view);
}
void zoom_in(Ewl_Widget *w, void *event, void *data)
{
- const char *path;
int ow, oh;
- path = ewl_image_file_path_get(EWL_IMAGE(image_view));
ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
- ewl_widget_destroy(ibox);
- ewl_widget_destroy(image_view);
-
- ibox = ewl_scrollpane_new();
- ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
- ewl_widget_show(ibox);
-
- image_view = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
- ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
- ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
ewl_image_size_set(EWL_IMAGE(image_view), ow*1.5, oh*1.5);
- ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
- ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
- ewl_widget_show(image_view);
+ ewl_widget_reparent(image_view);
}
void zoom_out(Ewl_Widget *w, void *event, void *data)
{
- const char *path;
int ow, oh;
- path = ewl_image_file_path_get(EWL_IMAGE(image_view));
ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
- ewl_widget_destroy(ibox);
- ewl_widget_destroy(image_view);
-
- ibox = ewl_scrollpane_new();
- ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
- ewl_widget_show(ibox);
-
- image_view = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
- ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
- ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
ewl_image_size_set(EWL_IMAGE(image_view), ow/1.5, oh/1.5);
- ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
- ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
- ewl_widget_show(image_view);
+ ewl_widget_reparent(image_view);
}
void original_size(Ewl_Widget *w, void *event, void *data)
@@ -93,28 +51,22 @@
path = ewl_image_file_path_get(EWL_IMAGE(image_view));
- ewl_widget_destroy(ibox);
ewl_widget_destroy(image_view);
- ibox = ewl_scrollpane_new();
- ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
- ewl_widget_show(ibox);
-
image_view = ewl_image_new();
ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
- ewl_widget_show(image_view);
+ ewl_widget_show(image_view);
}
void view_images(Ewl_Widget *w, void *event, void *data)
{
char *current_image;
Ewl_Widget *button;
+ Ewl_Widget *vbox;
Ewl_Widget *scrollpane;
Ewl_Widget *freebox;
Ewl_Widget *icon;
-
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
enli
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_viewer.c
Log Message:
Zooms work now! Zoom in, Zoom out, and Zoom original currently.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ephoto_viewer.c 30 Sep 2006 21:26:29 - 1.8
+++ ephoto_viewer.c 1 Oct 2006 00:05:41 - 1.9
@@ -1,5 +1,7 @@
#include "ephoto.h"
Ewl_Widget *vwin;
+Ewl_Widget *vbox;
+Ewl_Widget *ibox;
Ewl_Widget *image_view;
void destroy_vwin(Ewl_Widget *w, void *event, void *data)
@@ -12,9 +14,101 @@
char *path;
path = data;
+
+ ewl_widget_destroy(ibox);
+ ewl_widget_destroy(image_view);
+
+ ibox = ewl_scrollpane_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
+
+ image_view = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
+ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
+ ewl_widget_show(image_view);
+}
+
+void zoom_in(Ewl_Widget *w, void *event, void *data)
+{
+ const char *path;
+ int ow, oh;
- ewl_container_reset(EWL_CONTAINER(image_view));
- ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
+ path = ewl_image_file_path_get(EWL_IMAGE(image_view));
+ ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
+
+ ewl_widget_destroy(ibox);
+ ewl_widget_destroy(image_view);
+
+ ibox = ewl_scrollpane_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
+
+ image_view = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
+ ewl_image_size_set(EWL_IMAGE(image_view), ow*1.5, oh*1.5);
+ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
+ ewl_widget_show(image_view);
+}
+
+void zoom_out(Ewl_Widget *w, void *event, void *data)
+{
+ const char *path;
+ int ow, oh;
+
+ path = ewl_image_file_path_get(EWL_IMAGE(image_view));
+ ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
+
+ ewl_widget_destroy(ibox);
+ ewl_widget_destroy(image_view);
+
+ ibox = ewl_scrollpane_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
+
+ image_view = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
+ ewl_image_size_set(EWL_IMAGE(image_view), ow/1.5, oh/1.5);
+ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
+ ewl_widget_show(image_view);
+}
+
+void original_size(Ewl_Widget *w, void *event, void *data)
+{
+ const char *path;
+
+ path = ewl_image_file_path_get(EWL_IMAGE(image_view));
+
+ ewl_widget_destroy(ibox);
+ ewl_widget_destroy(image_view);
+
+ ibox = ewl_scrollpane_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
+
+ image_view = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
+ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
+ ewl_widget_show(image_view);
}
void view_images(Ewl_Widget *w, void *event, void *data)
@@ -25,8 +119,6 @@
Ewl_Widget *freebox;
Ewl_Widget *icon;
Ewl_Widget *image;
- Ewl_Widget *vbox;
- Ewl_Widget *ibox;
Ewl_Widget *hbox;
Ewl_Widget *cell;
Ecore_List *view_thumbs;
@@ -66,19 +158,17 @@
ewl_object_maximum_size_set(EWL_OBJECT(freebox), 9, 75);
ewl_widget_show(freebox);
- ibox = ewl_cell_new();
+ ibox = ewl_scrollpane_new();
ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_C
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/data/images Removed Files: Makefile Makefile.in Log Message: Get this trash out - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/data/images
Modified Files:
Makefile Makefile.am Makefile.in
Added Files:
add.png emblem-photos.png redo.png remove.png search.png
undo.png
Log Message:
New images and make ephoto use these images
===
RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile23 Sep 2006 14:19:02 - 1.1
+++ Makefile30 Sep 2006 21:26:29 - 1.2
@@ -145,14 +145,20 @@
sysconfdir = ${prefix}/etc
target_alias =
MAINTAINERCLEANFILES = Makefile.in
-FILES = folder.png \
+FILES = add.png \
+ emblem-favorite.png \
+ emblem-photos.png \
+ exit.png \
+ folder.png \
go-up.png \
go-home.png \
image.png \
- emblem-favorite.png \
- x-office-presentation.png \
preferences-system.png \
- exit.png
+ redo.png \
+ remove.png \
+ search.png \
+ undo.png \
+ x-office-presentation.png
imagedir = $(pkgdatadir)/images
image_DATA = $(FILES)
===
RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 23 Sep 2006 14:19:02 - 1.5
+++ Makefile.am 30 Sep 2006 21:26:29 - 1.6
@@ -1,12 +1,18 @@
MAINTAINERCLEANFILES = Makefile.in
-FILES = folder.png \
+FILES = add.png \
+ emblem-favorite.png \
+ emblem-photos.png \
+ exit.png \
+ folder.png \
go-up.png \
go-home.png \
image.png \
- emblem-favorite.png \
- x-office-presentation.png \
preferences-system.png \
- exit.png
+ redo.png \
+ remove.png \
+ search.png \
+ undo.png \
+ x-office-presentation.png
imagedir = $(pkgdatadir)/images
image_DATA = $(FILES)
EXTRA_DIST = $(FILES)
===
RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.in 23 Sep 2006 14:19:02 - 1.1
+++ Makefile.in 30 Sep 2006 21:26:29 - 1.2
@@ -145,14 +145,20 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
MAINTAINERCLEANFILES = Makefile.in
-FILES = folder.png \
+FILES = add.png \
+ emblem-favorite.png \
+ emblem-photos.png \
+ exit.png \
+ folder.png \
go-up.png \
go-home.png \
image.png \
- emblem-favorite.png \
- x-office-presentation.png \
preferences-system.png \
- exit.png
+ redo.png \
+ remove.png \
+ search.png \
+ undo.png \
+ x-office-presentation.png
imagedir = $(pkgdatadir)/images
image_DATA = $(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.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto.c ephoto_viewer.c Log Message: New images and make ephoto use these images === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -3 -r1.83 -r1.84 --- ephoto.c24 Sep 2006 23:30:19 - 1.83 +++ ephoto.c30 Sep 2006 21:26:29 - 1.84 @@ -62,12 +62,39 @@ ewl_widget_show(menu); menu_item = ewl_menu_item_new(); + ewl_button_image_set(EWL_BUTTON(menu_item), + PACKAGE_DATA_DIR "/images/add.png", NULL); ewl_button_label_set(EWL_BUTTON(menu_item), "Add Album"); 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_widget_show(menu_item); + + menu_item = ewl_menu_item_new(); + ewl_button_image_set(EWL_BUTTON(menu_item), + PACKAGE_DATA_DIR "/images/remove.png", NULL); + ewl_button_label_set(EWL_BUTTON(menu_item), "Remove Album"); + 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_widget_show(menu_item); + + menu = ewl_menu_new(); + ewl_button_label_set(EWL_BUTTON(menu), "Viewer"); + ewl_container_child_append(EWL_CONTAINER(menubar), menu); + ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE); + ewl_widget_show(menu); + menu_item = ewl_menu_item_new(); + ewl_button_image_set(EWL_BUTTON(menu_item), + PACKAGE_DATA_DIR "/images/emblem-photos.png", NULL); + ewl_button_label_set(EWL_BUTTON(menu_item), "Image Viewer"); + ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(menu), menu_item); + ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, view_images, NULL); + ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL); + ewl_widget_show(menu_item); + menu = ewl_menu_new(); ewl_button_label_set(EWL_BUTTON(menu), "Slideshow"); ewl_container_child_append(EWL_CONTAINER(menubar), menu); @@ -84,7 +111,6 @@ ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL); ewl_widget_show(menu_item); - menu_item = ewl_menu_item_new(); ewl_button_image_set(EWL_BUTTON(menu_item), PACKAGE_DATA_DIR "/images/x-office-presentation.png", NULL); === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ephoto_viewer.c 30 Sep 2006 19:38:07 - 1.7 +++ ephoto_viewer.c 30 Sep 2006 21:26:29 - 1.8 @@ -73,12 +73,65 @@ ewl_widget_show(ibox); image_view = ewl_image_new(); + ewl_theme_data_str_set(image_view, "/image/group", + ewl_theme_data_str_get(m->entry, "group")); ewl_container_child_append(EWL_CONTAINER(ibox), image_view); ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE); ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image_view); + + hbox = ewl_hbox_new(); + ewl_container_child_append(EWL_CONTAINER(vbox), hbox); + ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK); + ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER); + ewl_widget_show(hbox); + + button = ewl_button_new(); + ewl_button_image_set(EWL_BUTTON(button), + PACKAGE_DATA_DIR "/images/search.png", NULL); + ewl_button_label_set(EWL_BUTTON(button), "In"); + ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK); + ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(hbox), button); + ewl_widget_show(button); + button = ewl_button_new(); + ewl_button_image_set(EWL_BUTTON(button), + PACKAGE_DATA_DIR "/images/search.png", NULL); + ewl_button_label_set(EWL_BUTTON(button), "Out"); + ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK); + ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(hbox), button); + ewl_widget_show(button); + + button = ewl_button_new(); + ewl_button_image_set(EWL_BUTTON(button), + PACKAGE_DATA_DIR "/images/search.png", NULL); + ewl_button_label_set(EWL_BUTTON(button), "1:1"); + ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK); + ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(hbox), button); + ewl_widget
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_slideshow.c ephoto_viewer.c Log Message: Asthetics++ (sp?) hehe === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- ephoto_slideshow.c 30 Sep 2006 19:23:02 - 1.15 +++ ephoto_slideshow.c 30 Sep 2006 19:38:07 - 1.16 @@ -142,8 +142,6 @@ ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_SHRINK); if (sc->keep_aspect) ewl_image_proportional_set(EWL_IMAGE(image), TRUE); - ewl_theme_data_str_set(image, "/image/group", - ewl_theme_data_str_get(m->entry, "group")); ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(cell), image); ewl_widget_show(image); === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ephoto_viewer.c 30 Sep 2006 18:42:50 - 1.6 +++ ephoto_viewer.c 30 Sep 2006 19:38:07 - 1.7 @@ -74,8 +74,6 @@ image_view = ewl_image_new(); ewl_container_child_append(EWL_CONTAINER(ibox), image_view); - ewl_theme_data_str_set(image_view, "/image/group", - ewl_theme_data_str_get(m->entry, "group")); ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE); ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER); - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_slideshow.c
Log Message:
Slideshow is now nice and right where i want it. It sizes itself very nicely
with the way it is configured now.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ephoto_slideshow.c 30 Sep 2006 19:01:40 - 1.14
+++ ephoto_slideshow.c 30 Sep 2006 19:23:02 - 1.15
@@ -57,6 +57,7 @@
image_path = ecore_dlist_current(current_thumbs);
if(image_path)
{
+ ewl_container_reset(EWL_CONTAINER(sc->image));
ewl_image_file_set(EWL_IMAGE(sc->image), image_path, NULL);
}
else
@@ -67,6 +68,7 @@
image_path = ecore_dlist_current(current_thumbs);
if(image_path)
{
+ewl_container_reset(EWL_CONTAINER(sc->image));
ewl_image_file_set(EWL_IMAGE(sc->image), image_path, NULL);
}
else
@@ -90,7 +92,8 @@
sc = data;
image_path = ecore_dlist_goto_first(current_thumbs);
- ewl_image_file_set(EWL_IMAGE(w), image_path, NULL);
+ ewl_container_reset(EWL_CONTAINER(sc->image));
+ ewl_image_file_set(EWL_IMAGE(sc->image), image_path, NULL);
timer = ecore_timer_add(sc->length, change_picture, sc);
}
@@ -98,6 +101,7 @@
void start_slideshow(Ewl_Widget *w, void *event, void *data)
{
Ewl_Widget *window;
+ Ewl_Widget *vbox;
Ewl_Widget *cell;
Ewl_Widget *image;
Slide_Config *sc;
@@ -119,18 +123,27 @@
ewl_window_dialog_set(EWL_WINDOW(window), 1);
ewl_widget_show(window);
+ vbox = ewl_vbox_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(vbox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(window), vbox);
+ ewl_widget_show(vbox);
+
cell = ewl_cell_new();
ewl_object_fill_policy_set(EWL_OBJECT(cell), EWL_FLAG_FILL_ALL);
- ewl_container_child_append(EWL_CONTAINER(window), cell);
+ ewl_object_alignment_set(EWL_OBJECT(cell), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), cell);
ewl_widget_show(cell);
image = ewl_image_new();
if (sc->zoom)
ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_ALL);
- else
+ if (!sc->zoom)
ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_SHRINK);
if (sc->keep_aspect)
ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
+ ewl_theme_data_str_set(image, "/image/group",
+ ewl_theme_data_str_get(m->entry, "group"));
ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(cell), image);
ewl_widget_show(image);
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_slideshow.c
Log Message:
Make slideshow configure and size nicely.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto_slideshow.c 25 Sep 2006 00:06:30 - 1.13
+++ ephoto_slideshow.c 30 Sep 2006 19:01:40 - 1.14
@@ -82,20 +82,28 @@
}
}
}
+
+void show_first_image(Ewl_Widget *w, void *event, void *data)
+{
+ char *image_path;
+ Slide_Config *sc;
+
+ sc = data;
+ image_path = ecore_dlist_goto_first(current_thumbs);
+ ewl_image_file_set(EWL_IMAGE(w), image_path, NULL);
+
+ timer = ecore_timer_add(sc->length, change_picture, sc);
+}
void start_slideshow(Ewl_Widget *w, void *event, void *data)
{
Ewl_Widget *window;
Ewl_Widget *cell;
Ewl_Widget *image;
- char *image_path;
Slide_Config *sc;
int ew, eh;
sc = parse_slideshow_config();
- image_path = ecore_dlist_goto_first(current_thumbs);
-
- if (!image_path) return;
srand((unsigned int)time((time_t *)NULL));
@@ -105,8 +113,7 @@
if (sc->full_size)
ewl_window_fullscreen_set(EWL_WINDOW(window), 1);
if (sc->custom_size)
- ewl_object_maximum_size_set(EWL_OBJECT(window), sc->w_size, sc->h_size);
- ewl_object_minimum_size_set(EWL_OBJECT(window), sc->w_size, sc->h_size);
+ ewl_object_size_request(EWL_OBJECT(window), sc->w_size, sc->h_size);
ewl_callback_append(window, EWL_CALLBACK_DELETE_WINDOW, destroy_slideshow,
NULL);
ewl_callback_append(window, EWL_CALLBACK_CLICKED, destroy_slideshow, NULL);
ewl_window_dialog_set(EWL_WINDOW(window), 1);
@@ -117,23 +124,19 @@
ewl_container_child_append(EWL_CONTAINER(window), cell);
ewl_widget_show(cell);
- ewl_object_current_size_get(EWL_OBJECT(window), &ew, &eh);
-
image = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image), image_path, NULL);
if (sc->zoom)
ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_ALL);
else
ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_SHRINK);
if (sc->keep_aspect)
ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
- ewl_image_size_set(EWL_IMAGE(image), ew, eh);
ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(cell), image);
ewl_widget_show(image);
sc->image = image;
- timer = ecore_timer_add(sc->length, change_picture, sc);
+ ewl_callback_append(image, EWL_CALLBACK_SHOW, show_first_image, sc);
}
void initial_config()
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_viewer.c
Log Message:
Image viewer just got perfect!
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ephoto_viewer.c 24 Sep 2006 23:30:19 - 1.5
+++ ephoto_viewer.c 30 Sep 2006 18:42:50 - 1.6
@@ -1,7 +1,6 @@
#include "ephoto.h"
Ewl_Widget *vwin;
Ewl_Widget *image_view;
-Ewl_Widget *image_vbox;
void destroy_vwin(Ewl_Widget *w, void *event, void *data)
{
@@ -14,26 +13,21 @@
path = data;
- ewl_widget_destroy(image_view);
-
- image_view = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image_view), (char *)data, NULL);
- ewl_container_child_append(EWL_CONTAINER(image_vbox), image_view);
- ewl_image_size_set(EWL_IMAGE(image_view), 400, 200);
- ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
- ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER);
- ewl_widget_show(image_view);
+ ewl_container_reset(EWL_CONTAINER(image_view));
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
}
void view_images(Ewl_Widget *w, void *event, void *data)
{
char *current_image;
+ Ewl_Widget *button;
Ewl_Widget *scrollpane;
Ewl_Widget *freebox;
Ewl_Widget *icon;
Ewl_Widget *image;
Ewl_Widget *vbox;
+ Ewl_Widget *ibox;
+ Ewl_Widget *hbox;
Ewl_Widget *cell;
Ecore_List *view_thumbs;
@@ -71,20 +65,19 @@
ewl_object_fill_policy_set(EWL_OBJECT(freebox), EWL_FLAG_FILL_ALL);
ewl_object_maximum_size_set(EWL_OBJECT(freebox), 9, 75);
ewl_widget_show(freebox);
-
- image_vbox = ewl_vbox_new();
- ewl_theme_data_str_set(image_vbox, "/image/group",
-ewl_theme_data_str_get(m->entry, "group"));
- ewl_container_child_append(EWL_CONTAINER(vbox), image_vbox);
- ewl_object_fill_policy_set(EWL_OBJECT(image_vbox), EWL_FLAG_FILL_ALL);
- ewl_widget_show(image_vbox);
+
+ ibox = ewl_cell_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
image_view = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image_view), (char *)data, NULL);
- ewl_container_child_append(EWL_CONTAINER(image_vbox), image_view);
- ewl_image_size_set(EWL_IMAGE(image_view), 400, 200);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_theme_data_str_set(image_view, "/image/group",
+ ewl_theme_data_str_get(m->entry, "group"));
ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
- ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(image_view);
@@ -112,4 +105,5 @@
ecore_dlist_next(view_thumbs);
}
+ ewl_callback_append(vbox, EWL_CALLBACK_SHOW, change_image, data);
}
-
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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto Modified Files: AUTHORS Log Message: I didn't decided this didn't belong in the authors file here. === RCS file: /cvs/e/e17/proto/ephoto/AUTHORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- AUTHORS 23 Sep 2006 03:35:49 - 1.4 +++ AUTHORS 29 Sep 2006 02:27:11 - 1.5 @@ -1,4 +1,11 @@ += +| = = == == == ==| +| | | | || = = |_ _| = = | +| = |===| || == || == | +| | | || = =||= = | +| = | || == || ==| += + + ===Project Manager/Lead Developer=== Stephen "LinuxTitan" Houston <[EMAIL PROTECTED]> -===Website Developer/Maintainer=== -Colin "Phoul" Childs <[EMAIL PROTECTED]> - 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
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_slideshow.c Log Message: Very minor bug fix === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ephoto_slideshow.c 24 Sep 2006 16:22:42 - 1.12 +++ ephoto_slideshow.c 25 Sep 2006 00:06:30 - 1.13 @@ -377,7 +377,7 @@ ewl_text_text_set(EWL_TEXT(sc->wentry), "640"); ewl_container_child_append(EWL_CONTAINER(hbox), sc->wentry); ewl_object_size_request(EWL_OBJECT(sc->wentry), 35, 15); - ewl_widget_disable(sc->wentry); + if (!sc->custom_size) ewl_widget_disable(sc->wentry); ewl_widget_show(sc->wentry); text = ewl_text_new(); @@ -391,7 +391,7 @@ ewl_text_text_set(EWL_TEXT(sc->hentry), "480"); ewl_container_child_append(EWL_CONTAINER(hbox), sc->hentry); ewl_object_size_request(EWL_OBJECT(sc->hentry), 35, 15); - ewl_widget_disable(sc->hentry); + if (!sc->custom_size) ewl_widget_disable(sc->hentry); ewl_widget_show(sc->hentry); border = ewl_border_new(); - 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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto_callbacks.c ephoto_viewer.c
Log Message:
Some gfx fixup
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- ephoto.c23 Sep 2006 14:19:02 - 1.82
+++ ephoto.c24 Sep 2006 23:30:19 - 1.83
@@ -24,7 +24,7 @@
m->win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(m->win), "Ephoto");
ewl_window_name_set(EWL_WINDOW(m->win), "Ephoto");
- ewl_object_size_request(EWL_OBJECT(m->win), 640, 480);
+ ewl_object_size_request(EWL_OBJECT(m->win), 580, 460);
ewl_callback_append(m->win, EWL_CALLBACK_DELETE_WINDOW, destroy_cb, NULL);
ewl_widget_show(m->win);
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ephoto_callbacks.c 24 Sep 2006 16:22:42 - 1.28
+++ ephoto_callbacks.c 24 Sep 2006 23:30:19 - 1.29
@@ -141,7 +141,6 @@
char text[PATH_MAX];
Ecore_List *ls;
Ecore_List *images;
- Ewl_Widget *shadow;
Ewl_Widget *image;
Ewl_Widget *cell;
@@ -207,15 +206,9 @@
{
image_path = ecore_list_remove_first(images);
ecore_dlist_append(current_thumbs, image_path);
-
- shadow = ewl_shadow_new();
- ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), shadow);
- ewl_object_minimum_size_set(EWL_OBJECT(shadow), 125, 105);
- ewl_object_maximum_size_set(EWL_OBJECT(shadow), 125, 105);
- ewl_widget_show(shadow);
cell = ewl_cell_new();
- ewl_container_child_append(EWL_CONTAINER(shadow), cell);
+ ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), cell);
ewl_object_minimum_size_set(EWL_OBJECT(cell), 100, 85);
ewl_object_maximum_size_set(EWL_OBJECT(cell), 100, 85);
ewl_theme_data_str_set(cell, "/cell/group",
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ephoto_viewer.c 24 Sep 2006 16:22:42 - 1.4
+++ ephoto_viewer.c 24 Sep 2006 23:30:19 - 1.5
@@ -33,7 +33,6 @@
Ewl_Widget *freebox;
Ewl_Widget *icon;
Ewl_Widget *image;
- Ewl_Widget *shadow;
Ewl_Widget *vbox;
Ewl_Widget *cell;
Ecore_List *view_thumbs;
@@ -93,15 +92,9 @@
while (ecore_dlist_current(view_thumbs))
{
current_image = ecore_dlist_current(view_thumbs);
-
- shadow = ewl_shadow_new();
- ewl_container_child_append(EWL_CONTAINER(freebox), shadow);
- ewl_object_minimum_size_set(EWL_OBJECT(shadow), 66, 66);
- ewl_object_maximum_size_set(EWL_OBJECT(shadow), 66, 66);
- ewl_widget_show(shadow);
cell = ewl_cell_new();
- ewl_container_child_append(EWL_CONTAINER(shadow), cell);
+ ewl_container_child_append(EWL_CONTAINER(freebox), cell);
ewl_object_minimum_size_set(EWL_OBJECT(cell), 50, 50);
ewl_object_maximum_size_set(EWL_OBJECT(cell), 50, 50);
ewl_theme_data_str_set(cell, "/cell/group",
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_callbacks.c ephoto_slideshow.c ephoto_viewer.c
Log Message:
Add the abillity now to actually specify in the entries the size slideshow you
want (in pixels)
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ephoto_callbacks.c 24 Sep 2006 14:25:27 - 1.27
+++ ephoto_callbacks.c 24 Sep 2006 16:22:42 - 1.28
@@ -228,6 +228,7 @@
ewl_container_child_append(EWL_CONTAINER(cell), image);
ewl_image_size_set(EWL_IMAGE(image), 97, 83);
ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
+ ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(image);
}
ecore_list_destroy(ls);
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto_slideshow.c 23 Sep 2006 00:23:08 - 1.11
+++ ephoto_slideshow.c 24 Sep 2006 16:22:42 - 1.12
@@ -282,7 +282,24 @@
}
ewl_widget_destroy(sc->win);
}
-
+
+void change_radio(Ewl_Widget *w, void *event, void *data)
+{
+ Slide_Config *sc;
+ sc = data;
+
+ if (ewl_checkbutton_is_checked(EWL_CHECKBUTTON(sc->custom)))
+ {
+ ewl_widget_enable(sc->wentry);
+ ewl_widget_enable(sc->hentry);
+ }
+ else if (ewl_checkbutton_is_checked(EWL_CHECKBUTTON(sc->fullscreen)))
+ {
+ ewl_widget_disable(sc->wentry);
+ ewl_widget_disable(sc->hentry);
+ }
+}
+
void create_slideshow_config(Ewl_Widget *w, void *event, void *data)
{
char temp[PATH_MAX];
@@ -331,6 +348,7 @@
ewl_container_child_append(EWL_CONTAINER(hbox), sc->fullscreen);
ewl_radiobutton_checked_set(EWL_RADIOBUTTON(sc->fullscreen), sc->full_size);
ewl_object_alignment_set(EWL_OBJECT(sc->fullscreen), EWL_FLAG_ALIGN_LEFT);
+ ewl_callback_append(sc->fullscreen, EWL_CALLBACK_CLICKED, change_radio, sc);
ewl_widget_show(sc->fullscreen);
sc->custom = ewl_radiobutton_new();
@@ -340,6 +358,7 @@
ewl_radiobutton_chain_set(EWL_RADIOBUTTON(sc->fullscreen),
EWL_RADIOBUTTON(sc->custom));
ewl_object_alignment_set(EWL_OBJECT(sc->custom), EWL_FLAG_ALIGN_RIGHT);
+ ewl_callback_append(sc->custom, EWL_CALLBACK_CLICKED, change_radio, sc);
ewl_widget_show(sc->custom);
hbox = ewl_hbox_new();
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto_viewer.c 24 Sep 2006 14:25:27 - 1.3
+++ ephoto_viewer.c 24 Sep 2006 16:22:42 - 1.4
@@ -114,6 +114,7 @@
ewl_container_child_append(EWL_CONTAINER(cell), image);
ewl_image_size_set(EWL_IMAGE(image), 48, 48);
ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
+ ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(image);
ecore_dlist_next(view_thumbs);
-
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
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_callbacks.c ephoto_viewer.c
Log Message:
More work on thumbnails. Now they are proportional and look better.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ephoto_callbacks.c 23 Sep 2006 14:19:02 - 1.26
+++ ephoto_callbacks.c 24 Sep 2006 14:25:27 - 1.27
@@ -136,13 +136,14 @@
{
FILE *file_ptr;
const char *dir;
- char *image;
+ char *image_path;
char full_path[PATH_MAX];
char text[PATH_MAX];
Ecore_List *ls;
Ecore_List *images;
Ewl_Widget *shadow;
- Ewl_Widget *icon;
+ Ewl_Widget *image;
+ Ewl_Widget *cell;
ls = ecore_list_new();
images = ecore_list_new();
@@ -204,23 +205,30 @@
}
while(!ecore_list_is_empty(images))
{
- image = ecore_list_remove_first(images);
- ecore_dlist_append(current_thumbs, image);
+ image_path = ecore_list_remove_first(images);
+ ecore_dlist_append(current_thumbs, image_path);
shadow = ewl_shadow_new();
ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), shadow);
- ewl_object_minimum_size_set(EWL_OBJECT(shadow), 124, 124);
- ewl_object_maximum_size_set(EWL_OBJECT(shadow), 124, 124);
+ ewl_object_minimum_size_set(EWL_OBJECT(shadow), 125, 105);
+ ewl_object_maximum_size_set(EWL_OBJECT(shadow), 125, 105);
ewl_widget_show(shadow);
- icon = ewl_image_thumbnail_new();
- ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(icon), image);
- ewl_container_child_append(EWL_CONTAINER(shadow), icon);
- ewl_image_size_set(EWL_IMAGE(icon), 100, 100);
- ewl_theme_data_str_set(icon, "/image_thumbnail/group",
+ cell = ewl_cell_new();
+ ewl_container_child_append(EWL_CONTAINER(shadow), cell);
+ ewl_object_minimum_size_set(EWL_OBJECT(cell), 100, 85);
+ ewl_object_maximum_size_set(EWL_OBJECT(cell), 100, 85);
+ ewl_theme_data_str_set(cell, "/cell/group",
ewl_theme_data_str_get(m->entry, "group"));
- ewl_callback_append(icon, EWL_CALLBACK_CLICKED, view_images, image);
- ewl_widget_show(icon);
+ ewl_callback_append(cell, EWL_CALLBACK_CLICKED, view_images, image_path);
+ ewl_widget_show(cell);
+
+ image = ewl_image_thumbnail_new();
+ ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(image), image_path);
+ ewl_container_child_append(EWL_CONTAINER(cell), image);
+ ewl_image_size_set(EWL_IMAGE(image), 97, 83);
+ ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
+ ewl_widget_show(image);
}
ecore_list_destroy(ls);
ecore_list_destroy(images);
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ephoto_viewer.c 23 Sep 2006 14:19:02 - 1.2
+++ ephoto_viewer.c 24 Sep 2006 14:25:27 - 1.3
@@ -35,6 +35,7 @@
Ewl_Widget *image;
Ewl_Widget *shadow;
Ewl_Widget *vbox;
+ Ewl_Widget *cell;
Ecore_List *view_thumbs;
view_thumbs = current_thumbs;
@@ -92,19 +93,27 @@
while (ecore_dlist_current(view_thumbs))
{
current_image = ecore_dlist_current(view_thumbs);
+
shadow = ewl_shadow_new();
ewl_container_child_append(EWL_CONTAINER(freebox), shadow);
- ewl_object_minimum_size_set(EWL_OBJECT(shadow), 65, 65);
- ewl_object_maximum_size_set(EWL_OBJECT(shadow), 65, 65);
+ ewl_object_minimum_size_set(EWL_OBJECT(shadow), 66, 66);
+ ewl_object_maximum_size_set(EWL_OBJECT(shadow), 66, 66);
ewl_widget_show(shadow);
+ cell = ewl_cell_new();
+ ewl_container_child_append(EWL_CONTAINER(shadow), cell);
+ ewl_object_minimum_size_set(EWL_OBJECT(cell), 50, 50);
+ ewl_object_maximum_size_set(EWL_OBJECT(cell), 50, 50);
+ ewl_theme_data_str_set(cell, "/cell/group",
+ ewl_theme_data_str_get(m->entry, "group"));
+ ewl_callback_append(cell, EWL_CALLBACK_CLICKED, change_image, current_image);
+ ewl_widget_show(cell);
+
image = ewl_image_thumbnail_new();
ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(image), current_image);
- ewl_container_child_append(EWL_CONTAINER(shadow), image);
+ ewl_container_child_append(EWL_CONTAINER(cell), image);
ewl_image_size_set(EWL_IMAGE(image), 48, 48);
- ewl_theme_data_str_set(image, "/image_thumbnail/group",
-ewl_theme_data_str_get(m->entry, "group"));
- ewl_callback_append(image, EWL_CALLBACK_CLICKED, change_image,
current_image);
+ ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
ewl_widget_show(image);
ecore_dlist_next(view_thumbs);
-
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:
