Menu
▾
▴
E SVN: watchwolf IN trunk/PROTO: exalt eyelight/src/lib eyelight_edit/src/bin
|
From: Enlightenment S. <no-...@en...> - 2009-08-16 13:11:28
|
Log:
* Improve the list of slides in eyelight-editor, now the thumbnails are created from the thumbnails already created by eyelight (these thumbnails are used in the expose and the slideshow mode). The thumbs in the left list are a copy of the original but they are no re-created from a slide.
* Consequently now we create a thumbnail per slide instead of 2 (one used by the smart object in the expose mode and one used in the left list)
Author: watchwolf
Date: 2009-08-16 06:11:17 -0700 (Sun, 16 Aug 2009)
New Revision: 41821
Modified:
trunk/PROTO/exalt/INSTALL trunk/PROTO/eyelight/src/lib/Eyelight.h trunk/PROTO/eyelight/src/lib/Eyelight_Edit.h trunk/PROTO/eyelight/src/lib/eyelight_edit.c trunk/PROTO/eyelight/src/lib/eyelight_viewer.c trunk/PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.c trunk/PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.h trunk/PROTO/eyelight_edit/src/bin/slides_list.c
Modified: trunk/PROTO/exalt/INSTALL
===================================================================
--- trunk/PROTO/exalt/INSTALL 2009-08-16 11:45:55 UTC (rev 41820)
+++ trunk/PROTO/exalt/INSTALL 2009-08-16 13:11:17 UTC (rev 41821)
@@ -1,237 +1,17 @@
-Installation Instructions
-*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+Use theses classics commands to compile and install exalt :
+- ./autogen.sh
+- make
+- (as root) make install
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-Basic Installation
-==================
+wpa_supplicant is required to compile exalt, the executable can be found by the configure script or can be specified in the command line. With some distributions a simple user does'nt have wpa_supplicant in his path, consequently you have to specified its location in the command line :
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+- ./autogen.sh --with-wpa_supplicant=/sbin/wpa_supplicant
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+dhclient is not required by exalt but if you don't have it, you can not use dhcp. As for wpa_supplicant, the path of dhclient can be specified in the command line :
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
+- ./autogen.sh --with-dhcp=/sbin/dhclient
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
-
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
Modified: trunk/PROTO/eyelight/src/lib/Eyelight.h
===================================================================
--- trunk/PROTO/eyelight/src/lib/Eyelight.h 2009-08-16 11:45:55 UTC (rev 41820)
+++ trunk/PROTO/eyelight/src/lib/Eyelight.h 2009-08-16 13:11:17 UTC (rev 41821)
@@ -37,7 +37,17 @@
*/
typedef struct Eyelight_Viewer Eyelight_Viewer;
+typedef struct Eyelight_Thumb Eyelight_Thumb;
+typedef void (*Eyelight_Thumbnails_slide_done_cb) (Eyelight_Viewer *pres, int id_slide, Eyelight_Thumb* thumb, void* user_data);
+struct Eyelight_Thumb
+{
+ int* thumb;
+ int w;
+ int h;
+ int is_in_edj;
+};
+
EAPI Eyelight_Viewer* eyelight_viewer_new(Evas* evas, const char* pres, const char* theme,int with_boder);
EAPI void eyelight_viewer_destroy(Eyelight_Viewer**pres);
EAPI void eyelight_viewer_clean(Eyelight_Viewer *pres);
@@ -95,6 +105,9 @@
EAPI void eyelight_viewer_tableofcontents_previous(Eyelight_Viewer* pres);
EAPI void eyelight_viewer_tableofcontents_select(Eyelight_Viewer* pres);
-
+/**
+ * Set the callback called when eyelight has create a new thumbnail of a slide
+ */
+EAPI void eyelight_viewer_thumbnails_done_cb_set(Eyelight_Viewer* pres, Eyelight_Thumbnails_slide_done_cb cb, void *user_data);
#endif /* ----- #ifndef EYELIGHT_INC ----- */
Modified: trunk/PROTO/eyelight/src/lib/Eyelight_Edit.h
===================================================================
--- trunk/PROTO/eyelight/src/lib/Eyelight_Edit.h 2009-08-16 11:45:55 UTC (rev 41820)
+++ trunk/PROTO/eyelight/src/lib/Eyelight_Edit.h 2009-08-16 13:11:17 UTC (rev 41821)
@@ -4,16 +4,6 @@
#include "Eyelight.h"
-typedef struct Eyelight_Thumb Eyelight_Thumb;
-
-struct Eyelight_Thumb
-{
- int* thumb;
- int w;
- int h;
- int is_in_edj;
-};
-
/**
* This file describes a API which allows to work directly in the presentation (set item ...)
* Currently this API is empty
@@ -21,8 +11,6 @@
EAPI const char* eyelight_edit_slide_title_get(Eyelight_Viewer *pres, int id_slide);
-EAPI Eyelight_Thumb* eyelight_edit_thumbnails_get_new(Eyelight_Viewer* pres, int pos);
-
EAPI Eyelight_Viewer *eyelight_object_pres_get(Evas_Object *obj);
Modified: trunk/PROTO/eyelight/src/lib/eyelight_edit.c
===================================================================
--- trunk/PROTO/eyelight/src/lib/eyelight_edit.c 2009-08-16 11:45:55 UTC (rev 41820)
+++ trunk/PROTO/eyelight/src/lib/eyelight_edit.c 2009-08-16 13:11:17 UTC (rev 41821)
@@ -50,9 +50,4 @@
return title;
}
-Eyelight_Thumb* eyelight_edit_thumbnails_get_new(Eyelight_Viewer* pres, int pos)
-{
- return (Eyelight_Thumb*)eyelight_viewer_thumbnails_get_new(pres, pos);
-}
-
Modified: trunk/PROTO/eyelight/src/lib/eyelight_viewer.c
===================================================================
--- trunk/PROTO/eyelight/src/lib/eyelight_viewer.c 2009-08-16 11:45:55 UTC (rev 41820)
+++ trunk/PROTO/eyelight/src/lib/eyelight_viewer.c 2009-08-16 13:11:17 UTC (rev 41821)
@@ -783,4 +783,10 @@
eyelight_viewer_clear (pres);
}
+void eyelight_viewer_thumbnails_done_cb_set(Eyelight_Viewer* pres, Eyelight_Thumbnails_slide_done_cb cb, void *user_data)
+{
+ eyelight_viewer_thumbnails_init(pres);
+ pres->thumbnails->done_cb = cb;
+ pres->thumbnails->done_cb_data = user_data;
+}
Modified: trunk/PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.c
===================================================================
--- trunk/PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.c 2009-08-16 11:45:55 UTC (rev 41820)
+++ trunk/PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.c 2009-08-16 13:11:17 UTC (rev 41821)
@@ -27,6 +27,7 @@
void eyelight_viewer_thumbnails_init(Eyelight_Viewer* pres)
{
Eet_File* file;
+ if(pres->thumbnails) return ;
pres->thumbnails = calloc(1,sizeof(Eyelight_Thumbnails));
pres->thumbnails->default_size_w = pres->default_size_w/4;
@@ -93,22 +94,15 @@
thumbnails->thumbnails[pos].is_in_edj = 0;
thumbnails->thumbnails[pos].w = size_w;
thumbnails->thumbnails[pos].h = size_h;
+
+ if(pres->thumbnails->done_cb)
+ pres->thumbnails->done_cb(pres, pos, &(thumbnails->thumbnails[pos]),
+ pres->thumbnails->done_cb_data);
}
return &(thumbnails->thumbnails[pos]);
}
-const Eyelight_Thumb* eyelight_viewer_thumbnails_get_new(Eyelight_Viewer* pres, int pos)
-{
- Eyelight_Thumb *thumb = calloc(1,sizeof(Eyelight_Thumb));
-
- thumb->thumb = _eyelight_viewer_thumbnails_create(pres,pos,pres->thumbnails->default_size_w,pres->thumbnails->default_size_h);
- thumb->w = pres->thumbnails->default_size_w;
- thumb->h = pres->thumbnails->default_size_h;
-
- return thumb;
-}
-
int* _eyelight_viewer_thumbnails_create(Eyelight_Viewer* pres,int pos,int size_w, int size_h)
{
Ecore_Evas *ee;
@@ -203,6 +197,7 @@
EYELIGHT_FREE(pres_copy->slides);
EYELIGHT_FREE(pres_copy);
ecore_evas_free(ee);
+
return pixel_resize;
}
Modified: trunk/PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.h
===================================================================
--- trunk/PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.h 2009-08-16 11:45:55 UTC (rev 41820)
+++ trunk/PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.h 2009-08-16 13:11:17 UTC (rev 41821)
@@ -32,6 +32,9 @@
int idle_current_slide;
int default_size_w;
int default_size_h;
+
+ Eyelight_Thumbnails_slide_done_cb done_cb;
+ void *done_cb_data;
};
@@ -44,11 +47,5 @@
void eyelight_viewer_thumbnails_init(Eyelight_Viewer* pres);
-/**
- * Do not use the cache, the thumbnail is created and returns
- */
-const Eyelight_Thumb* eyelight_viewer_thumbnails_get_new(Eyelight_Viewer* pres, int pos);
-
-
#endif /* ----- #ifndef THUMBNAILS_INC ----- */
Modified: trunk/PROTO/eyelight_edit/src/bin/slides_list.c
===================================================================
--- trunk/PROTO/eyelight_edit/src/bin/slides_list.c 2009-08-16 11:45:55 UTC (rev 41820)
+++ trunk/PROTO/eyelight_edit/src/bin/slides_list.c 2009-08-16 13:11:17 UTC (rev 41821)
@@ -31,8 +31,6 @@
};
List_Item* _l_items = NULL;
-int _i_item_idle;
-Ecore_Idler* _idle = NULL;
Evas_Object *_sl = NULL;
char *_slides_list_label_get(const void *data, Evas_Object *obj, const char *part);
@@ -88,26 +86,21 @@
return vbox;
}
+void _thumb_done_cb(Eyelight_Viewer *pres, int id_slide, Eyelight_Thumb* thumb, void* user_data)
+{
+ _l_items[id_slide].thumb = thumb;
+ elm_genlist_item_update(_l_items[id_slide].item);
+}
void slides_list_update()
{
int i;
- for(i=0;_l_items && i<eyelight_object_size_get(pres);i++)
- {
- if(_l_items[i].thumb)
- {
- free(_l_items[i].thumb->thumb);
- free(_l_items[i].thumb);
- }
- }
-
if(_l_items) free(_l_items);
-
_l_items = calloc(eyelight_object_size_get(pres), sizeof(List_Item));
- if(_idle) ecore_idler_del(_idle);
- _i_item_idle = 0;
+ eyelight_viewer_thumbnails_done_cb_set(eyelight_object_pres_get(pres), _thumb_done_cb, NULL);
+
elm_genlist_clear(slides_list);
for(i=0;i<eyelight_object_size_get(pres);i++)
{
@@ -119,30 +112,8 @@
_slides_list_sel,
(void*)i);
}
-
- _idle = ecore_idler_add(_thumbnails_load_idle,pres);
}
-int _thumbnails_load_idle(void *data)
-{
- Evas_Object* pres = (Evas_Object*)data;
-
- if(_i_item_idle>=eyelight_object_size_get(pres))
- {
- _idle = NULL;
- _i_item_idle = 0;
- return 0;
- }
-
- _l_items[_i_item_idle].thumb = eyelight_edit_thumbnails_get_new(eyelight_object_pres_get(pres),
- _i_item_idle);
- elm_genlist_item_update(_l_items[_i_item_idle].item);
-
- _i_item_idle++;
- return 1;
-}
-
-
char *_slides_list_label_get(const void *data, Evas_Object *obj, const char *part)
{
int i = (int) data;
|