Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
entice.c prefs.c signals_image.c signals_thumb.c
Log Message:
breakage, updating signal/part namespace
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- entice.c 2 Apr 2004 22:53:47 -0000 1.40
+++ entice.c 3 Apr 2004 01:59:57 -0000 1.41
@@ -29,7 +29,7 @@
static void entice_current_free(void);
/**
- * hookup_edje_signals - Add signal callbacks for EnticeImage edje part
+ * hookup_edje_signals - Add signal callbacks for entice.image edje part
* @o - a validly loaded edje object
*/
static void
@@ -43,20 +43,34 @@
}
edje_callbacks;
- char *signals[] = { "EnticeImageDelete", "EnticeImageRemove",
- "EnticeImageNext", "EnticeImagePrev",
- "EnticeImageZoomIn", "EnticeImageZoomOut",
- "EnticeImageZoomInFocused", "EnticeImageZoomOutFocused",
- "EnticeImageZoomDefault", "EnticeImageZoomFit",
- "EnticeImageFitWindow", "EnticeImageRotateLeft",
- "EnticeImageRotateRight", "EnticeImageFlipHorizontal",
- "EnticeImageFlipVertical", "EnticeFullScreen",
- "EnticeThumbsScrollNextStart", "EnticeThumbsScrollPrevStart",
- "EnticeThumbsScrollStop",
- "EnticeImageScrollEastStart", "EnticeImageScrollWestStart",
- "EnticeImageScrollNorthStart", "EnticeImageScrollSouthStart",
- "EnticeImageScrollStop", "EnticeImageModified",
- "EnticeImageSave", "EnticeQuit", NULL
+ char *signals[] = {
+ "entice,image,current,delete",
+ "entice,image,current,remove",
+ "entice,image,next",
+ "entice,image,prev",
+ "entice,image,current,zoom,in",
+ "entice,image,current,zoom,out",
+ "entice,image,current,zoom,in,focused",
+ "entice,image,current,zoom,out,focused",
+ "entice,image,current,zoom,reset",
+ "entice,image,current,zoom,fit",
+ "entice,image,current,rotate,left",
+ "entice,image,current,rotate,right",
+ "entice,image,current,flip,horizontal",
+ "entice,image,current,flip,vertical",
+ "entice,image,current,scroll,start,east",
+ "entice,image,current,scroll,start,west",
+ "entice,image,current,scroll,start,north",
+ "entice,image,current,scroll,start,south",
+ "entice,image,current,scroll,stop",
+ "entice,image,current,modified",
+ "entice,image,current,save",
+ "entice,thumbnail,scroll,start,next",
+ "entice,thumbnail,scroll,start,prev",
+ "entice,thumbnail,scroll,stop",
+ "entice,window,fit,image",
+ "entice,window,fullscreen",
+ "entice,quit", NULL
};
void (*funcs[]) (void *data, Evas_Object * o, const char *emission,
const char *source) =
@@ -64,22 +78,22 @@
_entice_delete_current, _entice_remove_current, _entice_image_next,
_entice_image_prev, _entice_zoom_in, _entice_zoom_out,
_entice_zoom_in_focused, _entice_zoom_out_focused,
- _entice_zoom_default, _entice_zoom_fit, _entice_fit_window,
- _entice_rotate_left, _entice_rotate_right,
- _entice_flip_horizontal, _entice_flip_vertical,
- _entice_fullscreen, _entice_thumbs_scroll_next_start,
- _entice_thumbs_scroll_prev_start, _entice_thumbs_scroll_stop,
- _entice_image_scroll_east_start, _entice_image_scroll_west_start,
- _entice_image_scroll_north_start,
+ _entice_zoom_default, _entice_zoom_fit, _entice_rotate_left,
+ _entice_rotate_right, _entice_flip_horizontal,
+ _entice_flip_vertical, _entice_image_scroll_east_start,
+ _entice_image_scroll_west_start, _entice_image_scroll_north_start,
_entice_image_scroll_south_start, _entice_image_scroll_stop,
- _entice_image_modified, _entice_image_save, _entice_quit, NULL};
+ _entice_image_modified, _entice_image_save,
+ _entice_thumbs_scroll_next_start,
+ _entice_thumbs_scroll_prev_start, _entice_thumbs_scroll_stop,
+ _entice_fit_window, _entice_fullscreen, _entice_quit, NULL};
count = sizeof(signals) / sizeof(char *);
for (i = 0; i < count; i++)
edje_object_signal_callback_add(o, signals[i], "", funcs[i], NULL);
- edje_object_signal_callback_add(o, "drag,stop", "EnticeImage",
+ edje_object_signal_callback_add(o, "drag,stop", "entice.image",
_entice_image_drag_stop, NULL);
- edje_object_signal_callback_add(o, "drag,start", "EnticeImage",
+ edje_object_signal_callback_add(o, "drag,start", "entice.image",
_entice_image_drag_start, NULL);
return;
}
@@ -153,9 +167,9 @@
evas_object_layer_set(e->container, 0);
evas_object_color_set(e->container, 255, 255, 255, 255);
- if (edje_object_part_exists(e->edje, "EnticeThumbnailArea"))
+ if (edje_object_part_exists(e->edje, "entice.thumbnail.area"))
{
- edje_object_part_geometry_get(e->edje, "EnticeThumbnailArea", NULL,
+ edje_object_part_geometry_get(e->edje, "entice.thumbnail.area", NULL,
NULL, &ew, &eh);
if (ew > eh)
@@ -172,7 +186,7 @@
CONTAINER_FILL_POLICY_KEEP_ASPECT);
e_container_direction_set(e->container, 1);
}
- edje_object_part_swallow(e->edje, "EnticeThumbnailArea",
+ edje_object_part_swallow(e->edje, "entice.thumbnail.area",
e->container);
}
if ((str = edje_object_data_get(o, "entice.window.type")))
@@ -289,9 +303,10 @@
&& (thumb_edje =
evas_hash_find(entice->thumb.hash,
entice_image_file_get(entice->current))))
- edje_object_signal_emit(thumb_edje, "EnticeThumbUnLoaded", "");
+ edje_object_signal_emit(thumb_edje, "entice,thumb,unload", "");
- edje_object_signal_emit(entice->edje, "EnticeImageDisplayPrep", "");
+ edje_object_signal_emit(entice->edje, "entice,image,display,before",
+ "");
tmp = e_thumb_evas_object_get(o);
if ((new_current = entice_image_new(tmp)))
@@ -303,13 +318,13 @@
new_scroller =
e_thumb_new(evas_object_evas_get(o), e_thumb_file_get(o));
- edje_object_part_geometry_get(entice->edje, "EnticeImage", NULL,
+ edje_object_part_geometry_get(entice->edje, "entice.image", NULL,
NULL, &w, &h);
evas_object_resize(new_current, w, h);
evas_object_show(new_current);
- edje_object_part_geometry_get(entice->edje, "EnticeImageScroller",
- NULL, NULL, &w, &h);
+ edje_object_part_geometry_get(entice->edje, "entice.scroller", NULL,
+ NULL, &w, &h);
evas_object_resize(new_scroller, w, h);
evas_object_show(new_scroller);
@@ -326,7 +341,7 @@
evas_hash_find(entice->thumb.hash,
entice_image_file_get(entice->current))))
{
- edje_object_signal_emit(thumb_edje, "EnticeThumbLoaded", "");
+ edje_object_signal_emit(thumb_edje, "entice,thumb,load", "");
e_container_scroll_to(entice->container, thumb_edje);
}
@@ -337,11 +352,14 @@
/* Set the text descriptions for this image */
e_thumb_geometry_get(o, &iw, &ih);
snprintf(buf, PATH_MAX, "%d x %d", iw, ih);
- edje_object_part_text_set(entice->edje, "EnticeFileDimensions", buf);
- edje_object_part_text_set(entice->edje, "EnticeFileName",
+ 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), '/')))
- edje_object_part_text_set(entice->edje, "EnticeFileShortName",
+ edje_object_part_text_set(entice->edje,
+ "entice.image.current.filename.short",
tmpstr + 1);
/* FIXME: Support FileSize also */
@@ -352,15 +370,15 @@
evas_list_find_list(entice->thumb.list, _data);
/* swallow the images */
- edje_object_part_swallow(entice->edje, "EnticeImage", new_current);
- edje_object_part_swallow(entice->edje, "EnticeImageScroller",
+ edje_object_part_swallow(entice->edje, "entice.image", new_current);
+ edje_object_part_swallow(entice->edje, "entice.scroller",
new_scroller);
if (should_fit)
entice_image_zoom_fit(new_current);
/* let the app know it's ready to be displayed */
- edje_object_signal_emit(entice->edje, "EnticeImageDisplay", "");
+ edje_object_signal_emit(entice->edje, "entice,image,display", "");
}
else
{
@@ -396,18 +414,18 @@
evas_object_layer_get(entice->container));
edje = edje_object_add(ecore_evas_get(entice->ee));
if (edje_object_file_set
- (edje, entice_config_theme_get(), "EnticeThumb"))
+ (edje, entice_config_theme_get(), "entice.thumb"))
{
evas_object_layer_set(edje,
evas_object_layer_get(entice->
container));
- if (edje_object_part_exists(edje, "EnticeThumb"))
+ if (edje_object_part_exists(edje, "entice.thumb"))
{
entice->thumb.list =
evas_list_append(entice->thumb.list, o);
evas_object_resize(o, 48, 48);
hookup_entice_thumb_signals(edje, o);
- edje_object_part_swallow(edje, "EnticeThumb", o);
+ edje_object_part_swallow(edje, "entice.thumb", o);
evas_object_show(edje);
evas_object_show(o);
@@ -554,7 +572,7 @@
entice->current = evas_object_image_add(ecore_evas_get(entice->ee));
/* clean up the old images */
- swallowed = edje_object_part_swallow_get(entice->edje, "EnticeImage");
+ swallowed = edje_object_part_swallow_get(entice->edje, "entice.image");
if (swallowed)
{
edje_object_part_unswallow(entice->edje, swallowed);
@@ -562,7 +580,7 @@
swallowed = NULL;
}
swallowed =
- edje_object_part_swallow_get(entice->edje, "EnticeImageScroller");
+ edje_object_part_swallow_get(entice->edje, "entice.scroller");
if (swallowed)
{
edje_object_part_unswallow(entice->edje, swallowed);
@@ -601,7 +619,7 @@
{
entice->thumb.current = evas_list_last(entice->thumb.list);
}
- if ((obj = edje_object_part_swallow_get(o, "EnticeThumb")))
+ if ((obj = edje_object_part_swallow_get(o, "entice.thumb")))
{
entice->thumb.list = evas_list_remove(entice->thumb.list, obj);
evas_object_del(obj);
@@ -611,9 +629,18 @@
if (evas_list_count(entice->thumb.list) == 0)
{
entice->thumb.current = NULL;
- edje_object_part_text_set(entice->edje, "EnticeFileDimensions",
+ edje_object_part_text_set(entice->edje,
+ "entice.image.current.filename.full",
"");
- edje_object_part_text_set(entice->edje, "EnticeFileName", "");
+ edje_object_part_text_set(entice->edje,
+ "entice.image.current.filename.short",
+ "");
+ edje_object_part_text_set(entice->edje,
+ "entice.image.current.dimensions", "");
+ edje_object_part_text_set(entice->edje,
+ "entice.image.current.height", "");
+ edje_object_part_text_set(entice->edje,
+ "entice.image.current.width", "");
entice->thumb.list = evas_list_free(entice->thumb.list);
entice_current_free();
}
@@ -656,10 +683,11 @@
{
int result = 0;
+ edje_object_freeze(entice->edje);
result = entice_file_delete(entice_image_file_get(entice->current));
-
+ edje_object_thaw(entice->edje);
if (!result)
- edje_object_signal_emit(entice->edje, "EnticeImageNext", "");
+ edje_object_signal_emit(entice->edje, "entice,image,next", "");
}
}
void
@@ -669,9 +697,11 @@
{
int result = 0;
+ edje_object_freeze(entice->edje);
result = entice_file_remove(entice_image_file_get(entice->current));
+ edje_object_thaw(entice->edje);
if (!result)
- edje_object_signal_emit(entice->edje, "EnticeImageNext", "");
+ edje_object_signal_emit(entice->edje, "entice,image,next", "");
}
}
@@ -789,7 +819,7 @@
double ww, hh;
evas_object_resize(entice->edje, (double) w, (double) h);
- edje_object_part_geometry_get(entice->edje, "EnticeImage", NULL, NULL,
+ edje_object_part_geometry_get(entice->edje, "entice.image", NULL, NULL,
&ww, &hh);
evas_object_resize(entice->current, ww, hh);
if ((o = evas_object_name_find(ecore_evas_get(entice->ee), "trans")))
@@ -850,8 +880,7 @@
if (entice->preview)
{
swallowed =
- edje_object_part_swallow_get(entice->edje,
- "EnticeImagePreview");
+ edje_object_part_swallow_get(entice->edje, "entice.preview");
if (swallowed)
{
edje_object_part_unswallow(entice->edje, swallowed);
@@ -864,8 +893,7 @@
if (entice->preview)
{
swallowed =
- edje_object_part_swallow_get(entice->edje,
- "EnticeImagePreview");
+ edje_object_part_swallow_get(entice->edje, "entice.preview");
if (swallowed)
{
/* don't repreview the same image if cache is same */
@@ -880,9 +908,9 @@
e_thumb_new(evas_object_evas_get(o), e_thumb_file_get(o))))
{
- edje_object_signal_emit(entice->edje, "EnticeImagePreviewPrep", "");
- edje_object_part_geometry_get(entice->edje, "EnticeImagePreview", &x,
- &y, &w, &h);
+ edje_object_signal_emit(entice->edje, "entice,preview,before", "");
+ edje_object_part_geometry_get(entice->edje, "entice.preview", &x, &y,
+ &w, &h);
/*
* make it almost inivisble before swallowing, without this we get
@@ -890,11 +918,10 @@
*/
evas_object_move(newpreview, -50, -50);
evas_object_resize(newpreview, 48, 48);
- edje_object_part_swallow(entice->edje, "EnticeImagePreview",
- newpreview);
+ edje_object_part_swallow(entice->edje, "entice.preview", newpreview);
evas_object_show(newpreview);
- edje_object_signal_emit(entice->edje, "EnticeImagePreviewShow", "");
+ edje_object_signal_emit(entice->edje, "entice,preview,show", "");
}
else
{
@@ -910,7 +937,7 @@
{
edje_freeze();
if (entice_image_rotate(entice->current, 1))
- edje_object_signal_emit(entice->edje, "EnticeImageModified", "");
+ edje_object_signal_emit(entice->edje, "entice,image,modified", "");
edje_thaw();
}
}
@@ -921,7 +948,7 @@
{
edje_freeze();
if (entice_image_rotate(entice->current, 3))
- edje_object_signal_emit(entice->edje, "EnticeImageModified", "");
+ edje_object_signal_emit(entice->edje, "entice,image,modified", "");
edje_thaw();
}
}
@@ -932,7 +959,7 @@
{
edje_freeze();
if (entice_image_flip(entice->current, 1))
- edje_object_signal_emit(entice->edje, "EnticeImageModified", "");
+ edje_object_signal_emit(entice->edje, "entice,image,modified", "");
edje_thaw();
}
}
@@ -943,7 +970,7 @@
{
edje_freeze();
if (entice_image_flip(entice->current, 0))
- edje_object_signal_emit(entice->edje, "EnticeImageModified", "");
+ edje_object_signal_emit(entice->edje, "entice,image,modified", "");
edje_thaw();
}
}
@@ -970,15 +997,16 @@
if (entice && entice->current)
{
if ((swallowed =
- edje_object_part_swallow_get(entice->edje, "EnticeImage")))
+ edje_object_part_swallow_get(entice->edje, "entice.image")))
{
- edje_object_part_geometry_get(entice->edje, "EnticeImage", &xx, &yy,
+ edje_object_part_geometry_get(entice->edje, "entice.image", &xx, &yy,
NULL, NULL);
dx = x - xx;
dy = y - yy;
entice_image_x_scroll_offset_add(entice->current, -dx);
entice_image_y_scroll_offset_add(entice->current, -dy);
- edje_object_part_drag_value_set(entice->edje, "EnticeImage", dx, dy);
+ edje_object_part_drag_value_set(entice->edje, "entice.image", dx,
+ dy);
evas_object_geometry_get(entice->current, &x, &y, &w, &h);
evas_damage_rectangle_add(ecore_evas_get(entice->ee), x, y, w, h);
}
@@ -999,7 +1027,7 @@
}
else
{
- edje_object_part_geometry_get(entice->edje, "EnticeImage", &x, &y,
+ edje_object_part_geometry_get(entice->edje, "entice.image", &x, &y,
NULL, NULL);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/prefs.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- prefs.c 22 Jan 2004 19:39:13 -0000 1.15
+++ prefs.c 3 Apr 2004 01:59:57 -0000 1.16
@@ -189,7 +189,7 @@
{
entice_keys_init();
- snprintf(buf, PATH_MAX, "%s/.e/apps/entice/entice.db",
+ snprintf(buf, PATH_MAX, "%s/.e/apps/entice/config.db",
getenv("HOME"));
econfig->db = strdup(buf);
/* make sure we have a db, if not generate it */
@@ -283,12 +283,14 @@
char *dirs[] = { ".e", ".e/apps", ".e/apps/entice",
".e/apps/entice/themes"
};
- char *signals[] = { "EnticeImageZoomIn", "EnticeImageZoomOut",
- "EnticeFullScreen",
- "EnticeImageNext", "EnticeImagePrev", "EnticeImageZoomDefault",
- "EnticeImageZoomFit", "EnticeQuit", "EnticeImageRotateLeft",
- "EnticeImageRotateRight", "EnticeImageFlipHorizontal",
- "EnticeImageFlipVertical", "EnticeImageRemove"
+ char *signals[] =
+ { "entice,image,current,zoom,in", "entice,image,current,zoom,out",
+ "entice,window,fullscreen", "entice,image,next", "entice,image,prev",
+ "entice,image,current,zoom,reset", "entice,image,current,zoom,fit",
+ "entice,quit", "entice,image,current,rotate,left",
+ "entice,image,current,rotate,right",
+ "entice,image,current,flip,horizontal",
+ "entice,image,current,flip,vertical", "entice,image,remove"
};
char *keys[] =
{ "equal", "minus", "f", "space", "BackSpace", "n", "w", "q", "Left",
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/signals_image.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- signals_image.c 5 Nov 2003 10:30:26 -0000 1.8
+++ signals_image.c 3 Apr 2004 01:59:57 -0000 1.9
@@ -7,7 +7,7 @@
I want to add new functionality to Entice!
@verbatim
These are callbacks for all the signals Entice responds to
-If you want to add a new callback for EnticeImage do the following
+If you want to add a new callback for entice,image do the following
1. Add a function to signals_image.[ch]
2. Add a function to entice.[ch]
3. Have your signals_image.c function call your entice.c function
@@ -19,7 +19,7 @@
#include "signals_image.h"
#include "entice.h"
-#define DEBUG 0
+#define DEBUG 1
/**
* Delete the current image in entice from the disk
@@ -30,7 +30,7 @@
*
* There is currently no error checking done, or reporting saying
* whether or not the deletion was successful. The signal you want your
- * theme to emit to delete the file from disk is "EnticeImageDelete"
+ * theme to emit to delete the file from disk is "entice,imageDelete"
*
* Example .edc code to do this
* @code
@@ -39,7 +39,7 @@
* name, "DeleteFileRequest";
* signal, "";
* source, "";
- * action, SIGNAL_EMIT "EnticeImageDelete" "";
+ * action, SIGNAL_EMIT "entice,image,current,delete" "";
* }
* @endcode
*
@@ -66,7 +66,7 @@
* The current image is removed, and the next image in the filelist is
* loaded. The signal you want your theme to emit to remove the
* currently displayed image from entice's filelist is
- * "EnticeImageRmove"
+ * "entice,image,remove"
*
* Example .edc code to do this
* @code
@@ -75,7 +75,7 @@
* name, "RemoveFileRequest";
* signal, "";
* source, "";
- * action, SIGNAL_EMIT "EnticeImageRemove" "";
+ * action, SIGNAL_EMIT "entice,image,remove" "";
* }
* @endcode
*
@@ -101,7 +101,7 @@
*
* Load the next image in the filelist, if there's < 2 elements in the
* list emitting this signal does nothing. The signal you want your
- * theme to emit to load the next image is "EnticeImageNext"
+ * theme to emit to load the next image is "entice,image,next"
*
* Example .edc code to do this
* @code
@@ -110,7 +110,7 @@
* name, "ImageNextRequest";
* signal, "";
* source, "";
- * action, SIGNAL_EMIT "EnticeImageNext" "";
+ * action, SIGNAL_EMIT "entice,image,next" "";
* }
* @endcode
*
@@ -136,7 +136,7 @@
*
* Load the previous image in the filelist, if there's < 2 elements in
* the list emitting this signal does nothing. The signal you want your
- * theme to emit to load the previous image is "EnticeImagePrev"
+ * theme to emit to load the previous image is "entice,image,prev"
*
* Example .edc code to do this
* @code
@@ -145,7 +145,7 @@
* name, "ImagePreviousRequest";
* signal, "";
* source, "";
- * action, SIGNAL_EMIT "EnticeImagePrev" "";
+ * action, SIGNAL_EMIT "entice,image,prev" "";
* }
* @endcode
*
@@ -171,7 +171,7 @@
*
* Zoom in on the currently displayed image. The signal you want your
* theme to emit to zoom in on the currently displayed image is
- * "EnticeImageZoomIn"
+ * "entice,imageZoomIn"
*
* Example .edc code to do this
* @code
@@ -180,7 +180,7 @@
* name, "ImageZoomInRequest";
* signal, "";
* source, "";
- * action, SIGNAL_EMIT "EnticeImageZoomIn" "";
+ * action, SIGNAL_EMIT "entice,imageZoomIn" "";
* }
* @endcode
*
@@ -206,7 +206,7 @@
*
* Zoom in on the currently displayed image. The signal you want your
* theme to emit to zoom in on the currently displayed image is
- * "EnticeImageZoomOut"
+ * "entice,imageZoomOut"
*
* Example .edc code to do this
* @code
@@ -215,7 +215,7 @@
* name, "ImageZoomInRequest";
* signal, "";
* source, "";
- * action, SIGNAL_EMIT "EnticeImageZoomOut" "";
+ * action, SIGNAL_EMIT "entice,imageZoomOut" "";
* }
* @endcode
*
@@ -241,7 +241,7 @@
*
* Set zoom to be 1:1 relative to the images original size. The signal
* you want your theme to emit to zoom in on the currently displayed
- * image is "EnticeImageZoomDefault"
+ * image is "entice,imageZoomDefault"
*
* Example .edc code to do this
* @code
@@ -250,7 +250,7 @@
* name, "ImageZoomDefaultRequest";
* signal, "";
* source, "";
- * action, SIGNAL_EMIT "EnticeImageZoomDefault" "";
+ * action, SIGNAL_EMIT "entice,imageZoomDefault" "";
* }
* @endcode
*
@@ -267,7 +267,7 @@
source = NULL;
}
-/* EnticeImageZoomFit */
+/* entice,imageZoomFit */
void
_entice_zoom_fit(void *data, Evas_Object * o, const char *emission,
const char *source)
@@ -280,7 +280,7 @@
source = NULL;
}
-/* EnticeImageZoomInFocused */
+/* entice,imageZoomInFocused */
/* FIXME: get mouse coords from ecore, if image is under mouse center there */
void
_entice_zoom_in_focused(void *data, Evas_Object * o, const char *emission,
@@ -293,7 +293,7 @@
source = NULL;
}
-/* EnticeImageZoomOutFocused */
+/* entice,imageZoomOutFocused */
/* FIXME: get mouse coords from ecore, if image is under mouse center there */
void
_entice_zoom_out_focused(void *data, Evas_Object * o, const char *emission,
@@ -307,7 +307,7 @@
}
/* FIXME: I'm not sure how to do this with edje
- * README.theme states EnticeImageFitWindow should resize the window to
+ * README.theme states entice,imageFitWindow should resize the window to
* fit the image, for now I"m omitting this feature.
*/
void
@@ -321,7 +321,7 @@
source = NULL;
}
-/* EnticeImageRotateLeft */
+/* entice,imageRotateLeft */
void
_entice_rotate_left(void *data, Evas_Object * o, const char *emission,
const char *source)
@@ -334,7 +334,7 @@
source = NULL;
}
-/* EnticeImageRotateRight */
+/* entice,imageRotateRight */
void
_entice_rotate_right(void *data, Evas_Object * o, const char *emission,
const char *source)
@@ -347,7 +347,7 @@
source = NULL;
}
-/* EnticeImageFlipH */
+/* entice,imageFlipH */
void
_entice_flip_horizontal(void *data, Evas_Object * o, const char *emission,
const char *source)
@@ -360,7 +360,7 @@
source = NULL;
}
-/* EnticeImageFlipV */
+/* entice,imageFlipV */
void
_entice_flip_vertical(void *data, Evas_Object * o, const char *emission,
const char *source)
@@ -425,7 +425,7 @@
source = NULL;
}
-/* EnticeImageScrollEastStart */
+/* entice,imageScrollEastStart */
void
_entice_image_scroll_east_start(void *data, Evas_Object * o,
const char *emission, const char *source)
@@ -441,7 +441,7 @@
source = NULL;
}
-/* EnticeImageScrollWestStart */
+/* entice,imageScrollWestStart */
void
_entice_image_scroll_west_start(void *data, Evas_Object * o,
const char *emission, const char *source)
@@ -457,7 +457,7 @@
source = NULL;
}
-/* EnticeImageScrollNorthStart */
+/* entice,imageScrollNorthStart */
void
_entice_image_scroll_north_start(void *data, Evas_Object * o,
const char *emission, const char *source)
@@ -473,7 +473,7 @@
source = NULL;
}
-/* EnticeImageScrollSouthStart */
+/* entice,imageScrollSouthStart */
void
_entice_image_scroll_south_start(void *data, Evas_Object * o,
const char *emission, const char *source)
@@ -489,7 +489,7 @@
source = NULL;
}
-/* EnticeImageScrollStop */
+/* entice,imageScrollStop */
void
_entice_image_scroll_stop(void *data, Evas_Object * o, const char *emission,
const char *source)
@@ -515,7 +515,7 @@
source = NULL;
}
-/* EnticeImageModified */
+/* entice,imageModified */
void
_entice_image_modified(void *data, Evas_Object * o, const char *emission,
const char *source)
@@ -530,7 +530,7 @@
source = NULL;
}
-/* EnticeImageSave */
+/* entice,imageSave */
void
_entice_image_save(void *data, Evas_Object * o, const char *emission,
const char *source)
@@ -554,7 +554,7 @@
#if DEBUG
fprintf(stderr, "Drag stopped\n");
#endif
- if ((source) && !strcmp(source, "EnticeImage"))
+ if ((source) && !strcmp(source, "entice.image"))
entice_dragable_image_set(0);
}
@@ -565,6 +565,6 @@
#if DEBUG
fprintf(stderr, "Drag started\n");
#endif
- if ((source) && !strcmp(source, "EnticeImage"))
+ if ((source) && !strcmp(source, "entice.image"))
entice_dragable_image_set(1);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/signals_thumb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- signals_thumb.c 8 Jan 2004 20:03:20 -0000 1.6
+++ signals_thumb.c 3 Apr 2004 01:59:57 -0000 1.7
@@ -46,7 +46,7 @@
{
int i, count;
E_Thumb *thumb = NULL;
- char *signals[] = { "EnticeThumbPreview", "EnticeThumbLoad" };
+ char *signals[] = { "entice,thumb,preview", "entice,thumb,load" };
void (*funcs[]) (void *data, Evas_Object * obj, const char *emission,
const char *source) =
{
-------------------------------------------------------
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
