Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
entice.c signals_thumb.c
Log Message:
update to latest esmart
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- entice.c 9 Apr 2004 04:10:16 -0000 1.49
+++ entice.c 21 Apr 2004 23:36:24 -0000 1.50
@@ -9,9 +9,9 @@
#include <stdlib.h>
#include <limits.h>
#include <Esmart/container.h>
-#include <Esmart/E_Thumb.h>
+#include <Esmart/Esmart_Thumb.h>
#include <Esmart/Esmart_Trans.h>
-#include <Esmart/dragable.h>
+#include <Esmart/Esmart_Draggies.h>
#include <Epsilon.h>
#include <string.h>
#include <sys/types.h>
@@ -307,10 +307,10 @@
char buf[PATH_MAX];
if ((entice->current) && entice_image_file_get(entice->current)
- && !strcmp(e_thumb_file_get(o),
+ && !strcmp(esmart_thumb_file_get(o),
entice_image_file_get(entice->current)))
return;
- e_thumb_freshen(o);
+ esmart_thumb_freshen(o);
if (entice_image_file_get(entice->current)
&& (thumb_edje =
@@ -321,16 +321,17 @@
edje_object_signal_emit(entice->edje, "entice,image,display,before",
"");
- tmp = e_thumb_evas_object_get(o);
+ tmp = esmart_thumb_evas_object_get(o);
if ((new_current = entice_image_new(tmp)))
{
- entice_image_file_set(new_current, e_thumb_file_get(o));
- entice_image_format_set(new_current, e_thumb_format_get(o));
+ entice_image_file_set(new_current, esmart_thumb_file_get(o));
+ entice_image_format_set(new_current, esmart_thumb_format_get(o));
entice_image_save_quality_set(new_current,
entice_config_image_quality_get());
new_scroller =
- e_thumb_new(evas_object_evas_get(o), e_thumb_file_get(o));
+ esmart_thumb_new(evas_object_evas_get(o),
+ esmart_thumb_file_get(o));
edje_object_part_geometry_get(entice->edje, "entice.image", NULL,
NULL, &w, &h);
evas_object_resize(new_current, w, h);
@@ -371,20 +372,20 @@
entice->scroller = new_scroller;
/* Set the text descriptions for this image */
- e_thumb_geometry_get(o, &iw, &ih);
+ esmart_thumb_geometry_get(o, &iw, &ih);
snprintf(buf, PATH_MAX, "%d x %d", iw, ih);
edje_object_part_text_set(entice->edje,
"entice.image.current.dimensions", buf);
edje_object_part_text_set(entice->edje,
"entice.image.current.filename.full",
- e_thumb_file_get(o));
- if ((tmpstr = strrchr(e_thumb_file_get(o), '/')))
+ esmart_thumb_file_get(o));
+ if ((tmpstr = strrchr(esmart_thumb_file_get(o), '/')))
edje_object_part_text_set(entice->edje,
"entice.image.current.filename.short",
tmpstr + 1);
/* FIXME: Support FileSize also */
- snprintf(buf, PATH_MAX, "Entice: %s", e_thumb_file_get(o));
+ snprintf(buf, PATH_MAX, "Entice: %s", esmart_thumb_file_get(o));
ecore_evas_title_set(entice->ee, buf);
entice->thumb.current =
@@ -428,7 +429,7 @@
snprintf(buf, PATH_MAX, "%s", file);
if ((evas_hash_find(entice->thumb.hash, buf)) == NULL)
{
- if ((o = e_thumb_new(ecore_evas_get(entice->ee), buf)))
+ if ((o = esmart_thumb_new(ecore_evas_get(entice->ee), buf)))
{
evas_object_layer_set(o,
@@ -864,7 +865,7 @@
{
double x, y, w, h;
- if (e_thumb_freshen(o) == EPSILON_OK)
+ if (esmart_thumb_freshen(o) == EPSILON_OK)
{
if (entice->preview)
{
@@ -886,7 +887,9 @@
if (swallowed)
{
/* don't repreview the same image if cache is same */
- if (!strcmp(e_thumb_file_get(o), e_thumb_file_get(swallowed)))
+ if (!strcmp
+ (esmart_thumb_file_get(o),
+ esmart_thumb_file_get(swallowed)))
return;
edje_object_part_unswallow(entice->edje, swallowed);
evas_object_del(swallowed);
@@ -894,7 +897,8 @@
}
}
if ((newpreview =
- e_thumb_new(evas_object_evas_get(o), e_thumb_file_get(o))))
+ esmart_thumb_new(evas_object_evas_get(o),
+ esmart_thumb_file_get(o))))
{
edje_object_signal_emit(entice->edje, "entice,preview,before", "");
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/signals_thumb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- signals_thumb.c 3 Apr 2004 01:59:57 -0000 1.7
+++ signals_thumb.c 21 Apr 2004 23:36:42 -0000 1.8
@@ -1,6 +1,6 @@
#include "signals_thumb.h"
#include <limits.h>
-#include <Esmart/E_Thumb.h>
+#include <Esmart/Esmart_Thumb.h>
#include "entice.h"
/** _entice_thumb_load_cb - when a EnticeThumbLoad signal is emitted
@@ -45,7 +45,7 @@
hookup_entice_thumb_signals(Evas_Object * o, Evas_Object * im)
{
int i, count;
- E_Thumb *thumb = NULL;
+ Esmart_Thumb *thumb = NULL;
char *signals[] = { "entice,thumb,preview", "entice,thumb,load" };
void (*funcs[]) (void *data, Evas_Object * obj, const char *emission,
const char *source) =
@@ -54,6 +54,6 @@
count = sizeof(signals) / sizeof(char *);
for (i = 0; i < count; i++)
edje_object_signal_callback_add(o, signals[i], "", funcs[i], im);
- if ((thumb = (E_Thumb *) evas_object_smart_data_get(im)))
+ if ((thumb = (Esmart_Thumb *) evas_object_smart_data_get(im)))
evas_object_pass_events_set(thumb->image, 1);
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
