From: <enl...@li...> - 2003-10-14 23:18:49
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/themes/default Modified Files: default.edc Log Message: I accidently disabled scrolling left =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/default/default.edc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- default.edc 14 Oct 2003 16:39:57 -0000 1.3 +++ default.edc 14 Oct 2003 23:18:46 -0000 1.4 @@ -91,9 +91,9 @@ rel1 { relative, 1.0 0.0; - offset, 40 75; + offset, 30 75; to_y, "bg"; - to_x, "EnticeThumbnailArea"; + to_x, "PanelMouseArea"; } rel2 { |
From: <enl...@li...> - 2003-10-16 06:20:31
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: entice.c Log Message: This was evil, make sure your edje is resized to window size before querying part size. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- entice.c 14 Oct 2003 18:33:29 -0000 1.5 +++ entice.c 16 Oct 2003 06:17:46 -0000 1.6 @@ -82,6 +82,7 @@ { Entice *e = NULL; Evas_Object *o = NULL; + int x, y, w, h; if ((ee) && (e = (Entice *) malloc(sizeof(Entice)))) { @@ -89,10 +90,12 @@ e->ee = ee; e_thumb_init(); + ecore_evas_geometry_get(ee, &x, &y, &w, &h); o = edje_object_add(ecore_evas_get(ee)); edje_object_file_set(o, entice_config_theme_get(), "Entice"); evas_object_name_set(o, "EnticeEdje"); evas_object_move(o, 0, 0); + evas_object_resize(o, w, h); hookup_edje_signals(o); evas_object_show(o); e->edje = o; |
From: <enl...@li...> - 2003-10-16 06:29:01
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/themes/default Modified Files: default.edc Log Message: This should be a lot easier on your cpu as the thumbnail area disappears =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/default/default.edc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- default.edc 14 Oct 2003 23:18:46 -0000 1.4 +++ default.edc 16 Oct 2003 06:28:08 -0000 1.5 @@ -388,6 +388,24 @@ rel1 { relative, 0.0 0.0; + offset, -64 0; + to, "bg"; + } + rel2 + { + relative, 0.0 1.0; + offset, 0 0; + to, "bg"; + } + color, 255 255 255 32; + } + description + { + state, "visible" 0.0; + visible, 1; + rel1 + { + relative, 0.0 0.0; offset, 0 0; to, "bg"; } @@ -484,27 +502,6 @@ } rel2 { - relative, 0.0 1.0; - offset, 0 0; - to, "PanelClip"; - } - image - { - normal, "panel.png"; - } - } - description - { - state, "visible" 0.0; - visible, 1; - rel1 - { - relative, 0.0 0.0; - offset, 0 0; - to, "PanelClip"; - } - rel2 - { relative, 1.0 1.0; offset, 0 0; to, "PanelClip"; @@ -1389,6 +1386,7 @@ name, "EnticeThumbnailArea"; type, RECT; mouse_events, 0; + clip_to, "PanelClip"; description { state, "default" 0.0; @@ -1401,26 +1399,8 @@ } rel2 { - relative, 1.0 1.0; - offset, -15 -40; - to, "Panel"; - } - color, 0 0 0 0; - } - description - { - state, "visible" 0.0; - visible, 1; - rel1 - { - relative, 0.0 0.0; - offset, 4 40; - to, "Panel"; - } - rel2 - { - relative, 1.0 1.0; - offset, -15 -40; + relative, 0.0 1.0; + offset, 50 -40; to, "Panel"; } color, 0 0 0 0; @@ -1546,8 +1526,7 @@ source, "PanelMouseArea"; action, STATE_SET "visible" 0.0; transition, ACCELERATE 0.3; - target, "Panel"; - target, "EnticeThumbnailArea"; + target, "PanelClip"; } program { @@ -1565,8 +1544,7 @@ source, "bg"; action, STATE_SET "default" 0.0; transition, DECELERATE 0.75; - target, "Panel"; - target, "EnticeThumbnailArea"; + target, "PanelClip"; target, "Buttons"; } program |
From: <enl...@li...> - 2003-10-17 21:36:17
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: entice.c image.c image.h Log Message: * Have entice load the first image it receives * Translate mouse events from our image object back to edje =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- entice.c 16 Oct 2003 06:17:46 -0000 1.6 +++ entice.c 17 Oct 2003 21:36:08 -0000 1.7 @@ -262,6 +262,7 @@ edje_object_part_swallow(entice->edje, "EnticeImage", new_current); edje_object_part_swallow(entice->edje, "EnticeImageScroller", new_scroller); + entice_image_edje_set(new_current, entice->edje); if (should_fit) entice_image_zoom_fit(new_current); @@ -307,6 +308,8 @@ evas_object_show(edje); e_container_element_append(entice->container, edje); + if (evas_list_count(entice->thumb.list) == 1) + _entice_thumb_load(o, NULL, NULL, NULL); } else result = 1; @@ -684,8 +687,8 @@ if (entice && entice->current) { edje_freeze(); - if(entice_image_save(entice->current)) - fprintf(stderr, "Saving was successul\n"); + if (entice_image_save(entice->current)) + fprintf(stderr, "Saving was successul\n"); /* FIXME: Emit a EnticeSaveOk or something signal */ edje_thaw(); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/image.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- image.c 14 Oct 2003 22:08:53 -0000 1.25 +++ image.c 17 Oct 2003 21:36:08 -0000 1.26 @@ -11,10 +11,25 @@ #include <Ecore.h> #include "image.h" -#define DEBUG 0 +#define DEBUG 1 static void entice_image_resize(Evas_Object * o, double w, double h); static int _entice_image_scroll_timer(void *data); +static void _entice_image_mouse_down_translate(void *data, Evas * e, + Evas_Object * obj, + void *event_info); +static void _entice_image_mouse_in_translate(void *data, Evas * e, + Evas_Object * obj, + void *event_info); +static void _entice_image_mouse_out_translate(void *data, Evas * e, + Evas_Object * obj, + void *event_info); +static void _entice_image_mouse_up_translate(void *data, Evas * e, + Evas_Object * obj, + void *event_info); +static void _entice_image_mouse_wheel_translate(void *data, Evas * e, + Evas_Object * obj, + void *event_info); const char * entice_image_format_get(Evas_Object * o) @@ -404,6 +419,27 @@ entice_image_resize(o, im->w, im->h); } } +void +entice_image_edje_set(Evas_Object * o, Evas_Object * edje) +{ + Entice_Image *im = NULL; + + if ((edje) && (im = evas_object_smart_data_get(o))) + { + evas_object_event_callback_add(im->obj, EVAS_CALLBACK_MOUSE_IN, + _entice_image_mouse_in_translate, edje); + evas_object_event_callback_add(im->obj, EVAS_CALLBACK_MOUSE_OUT, + _entice_image_mouse_out_translate, edje); + evas_object_event_callback_add(im->obj, EVAS_CALLBACK_MOUSE_UP, + _entice_image_mouse_up_translate, edje); + evas_object_event_callback_add(im->obj, EVAS_CALLBACK_MOUSE_DOWN, + _entice_image_mouse_down_translate, + edje); + evas_object_event_callback_add(im->obj, EVAS_CALLBACK_MOUSE_WHEEL, + _entice_image_mouse_wheel_translate, + edje); + } +} /** * _entice_image_scroll_timer - our ecore timer to do continuous @@ -515,6 +551,7 @@ im->clip = evas_object_rectangle_add(evas_object_evas_get(o)); evas_object_color_set(im->clip, 255, 255, 255, 255); evas_object_layer_set(im->clip, 0); + im->zoom = 1.0; im->fit = 1; evas_object_smart_data_set(o, im); @@ -718,6 +755,7 @@ im = evas_object_smart_data_get(o); im->obj = image; + evas_object_image_size_get(im->obj, &w, &h); evas_object_clip_set(im->obj, im->clip); evas_object_show(im->obj); @@ -820,3 +858,99 @@ return (0); } #endif +/** + * The following five functions translate evas mouse events into edje + * mouse event signal emissions + */ +static void +_entice_image_mouse_wheel_translate(void *data, Evas * e, Evas_Object * obj, + void *event_info) +{ + Evas_Event_Mouse_Wheel *ev = NULL; + Evas_Object *o = NULL; + + if ((ev = (Evas_Event_Mouse_Wheel *) event_info)) + { + if ((o = (Evas_Object *) data)) + { + evas_event_feed_mouse_wheel_data(e, ev->direction, ev->z, o); + } + } +#if DEBUG + fprintf(stderr, "MouseWheel\n"); +#endif +} + +static void +_entice_image_mouse_in_translate(void *data, Evas * e, Evas_Object * obj, + void *event_info) +{ + Evas_Event_Mouse_In *ev = NULL; + Evas_Object *o = NULL; + + if ((ev = (Evas_Event_Mouse_In *) event_info)) + if ((o = (Evas_Object *) data)) + edje_object_signal_emit(o, "mouse,in", "EnticeImage"); +#if DEBUG + fprintf(stderr, "MouseIn\n"); +#endif +} + +static void +_entice_image_mouse_out_translate(void *data, Evas * e, Evas_Object * obj, + void *event_info) +{ + Evas_Event_Mouse_Out *ev = NULL; + Evas_Object *o = NULL; + + if ((ev = (Evas_Event_Mouse_Out *) event_info)) + if ((o = (Evas_Object *) data)) + edje_object_signal_emit(o, "mouse,out", "EnticeImage"); +#if DEBUG + fprintf(stderr, "MouseOut\n"); +#endif +} + +static void +_entice_image_mouse_up_translate(void *data, Evas * e, Evas_Object * obj, + void *event_info) +{ + Evas_Event_Mouse_Up *ev = NULL; + Evas_Object *o = NULL; + + if ((ev = (Evas_Event_Mouse_Up *) event_info)) + { + if ((o = (Evas_Object *) data)) + { + char buf[PATH_MAX]; + + snprintf(buf, PATH_MAX, "mouse,up,%i", (int) ev->button); + edje_object_signal_emit(o, buf, "EnticeImage"); + } + } +#if DEBUG + fprintf(stderr, "MouseUp"); +#endif +} + +static void +_entice_image_mouse_down_translate(void *data, Evas * e, Evas_Object * obj, + void *event_info) +{ + Evas_Event_Mouse_Down *ev = NULL; + Evas_Object *o = NULL; + + if ((ev = (Evas_Event_Mouse_Down *) event_info)) + { + if ((o = (Evas_Object *) data)) + { + char buf[PATH_MAX]; + + snprintf(buf, PATH_MAX, "mouse,down,%i", (int) ev->button); + edje_object_signal_emit(o, buf, "EnticeImage"); + } + } +#if DEBUG + fprintf(stderr, "MouseDown\n"); +#endif +} =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/image.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- image.h 14 Oct 2003 18:33:29 -0000 1.15 +++ image.h 17 Oct 2003 21:36:08 -0000 1.16 @@ -70,5 +70,6 @@ int entice_image_save(Evas_Object * o); void entice_image_file_set(Evas_Object * o, const char *filename); void entice_image_format_set(Evas_Object * o, const char *format); +void entice_image_edje_set(Evas_Object * o, Evas_Object * edje); #endif |
From: <enl...@li...> - 2003-10-17 21:37:31
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/images Added Files: bt_north_1.png bt_south_1.png Log Message: Buttons for panning north and south |
From: <enl...@li...> - 2003-10-17 21:45:27
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/themes/default Modified Files: default.edc Log Message: slight ui change, - panning is done via a hidden bar, mouse towards bottom center to get it. - fill the entire window with the image - Take advantage of EnticeImage receiving events now =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/default/default.edc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- default.edc 16 Oct 2003 06:28:08 -0000 1.5 +++ default.edc 17 Oct 2003 21:44:30 -0000 1.6 @@ -20,6 +20,8 @@ image, "bt_rotate_l_1.png" LOSSY 95; image, "bt_save_1.png" LOSSY 95; image, "bt_slideshow_1.png" LOSSY 95; + image, "bt_north_1.png" LOSSY 95; + image, "bt_south_1.png" LOSSY 95; image, "bt_prev_2.png" LOSSY 95; image, "bt_next_2.png" LOSSY 95; image, "bt_zoom_normal_2.png" LOSSY 95; @@ -84,24 +86,27 @@ name, "EnticeImage"; type, IMAGE; mouse_events, 1; +// dragable +// { +// confine, "bg"; +// } description { state, "default" 0.0; visible, 1; rel1 { - relative, 1.0 0.0; - offset, 30 75; - to_y, "bg"; - to_x, "PanelMouseArea"; + relative, 0.0 0.0; + offset, 0 0; + to, "bg"; } rel2 { relative, 1.0 1.0; - offset, -20 -40; + offset, 0 0; to, "bg"; } - color, 255 255 255 255; + color, 255 255 255 0; } description { @@ -178,28 +183,95 @@ } part { + name, "PanningClipMouseArea"; + type, RECT; + mouse_events, 1; + description + { + state, "default" 0.0; + visible, 1; + rel1 + { + relative, 0.5 1.0; + offset, -90 -50; + to, "bg"; + } + rel2 + { + relative, 0.5 1.0; + offset, 90 0; + to, "bg"; + } + color, 255 255 255 0; + } + } + part + { + name, "PanningClip"; + type, RECT; + mouse_events, 1; + description + { + state, "default" 0.0; + visible, 1; + rel1 + { + relative, 0.5 1.0; + offset, -72 -40; + to, "bg"; + } + rel2 + { + relative, 0.5 1.0; + offset, 72 0; + to, "bg"; + } + color, 255 255 255 0; + } + description + { + state, "visible" 0.0; + visible, 1; + rel1 + { + relative, 0.5 1.0; + offset, -72 -40; + to, "bg"; + } + rel2 + { + relative, 0.5 1.0; + offset, 72 0; + to, "bg"; + } + color, 255 255 255 255; + } + } + part + { name, "ButtonScrollWest"; type, IMAGE; mouse_events, 1; + clip_to, "PanningClip"; description { state, "default" 0.0; visible, 1; rel1 { - relative, 0.0 0.5; - offset, -16 -8; - to, "EnticeImage"; + relative, 0.5 1.0; + offset, -72 -34; + to, "bg"; } rel2 { - relative, 0.0 0.5; - offset, 0 8; - to, "EnticeImage"; + relative, 0.5 1.0; + offset, -40 -2; + to, "bg"; } image { - normal, "arrow_l.png"; + normal, "bt_prev_1.png"; } color, 255 255 255 255; } @@ -209,19 +281,19 @@ visible, 1; rel1 { - relative, 0.0 0.5; - offset, -16 -8; - to, "EnticeImage"; + relative, 0.5 1.0; + offset, -72 -34; + to, "bg"; } rel2 { - relative, 0.0 0.5; - offset, 0 8; - to, "EnticeImage"; + relative, 0.5 1.0; + offset, -40 -2; + to, "bg"; } image { - normal, "arrow_l.png"; + normal, "bt_prev_1.png"; } color, 255 255 255 0; } @@ -231,25 +303,26 @@ name, "ButtonScrollEast"; type, IMAGE; mouse_events, 1; + clip_to, "PanningClip"; description { state, "default" 0.0; visible, 1; rel1 { - relative, 1.0 0.5; - offset, 0 -8; - to, "EnticeImage"; + relative, 0.5 1.0; + offset, -36 -34; + to, "bg"; } rel2 { - relative, 1.0 0.5; - offset, 16 8; - to, "EnticeImage"; + relative, 0.5 1.0; + offset, -4 -2; + to, "bg"; } image { - normal, "arrow_r.png"; + normal, "bt_next_1.png"; } color, 255 255 255 255; } @@ -259,19 +332,19 @@ visible, 1; rel1 { - relative, 1.0 0.5; - offset, 0 -8; - to, "EnticeImage"; + relative, 0.5 1.0; + offset, -36 -34; + to, "bg"; } rel2 { - relative, 1.0 0.5; - offset, 16 8; - to, "EnticeImage"; + relative, 0.5 1.0; + offset, -4 -2; + to, "bg"; } image { - normal, "arrow_r.png"; + normal, "bt_next_1.png"; } color, 255 255 255 0; } @@ -281,25 +354,26 @@ name, "ButtonScrollNorth"; type, IMAGE; mouse_events, 1; + clip_to, "PanningClip"; description { state, "default" 0.0; visible, 1; rel1 { - relative, 0.5 0.0; - offset, -8 -16; - to, "EnticeImage"; + relative, 0.5 1.0; + offset, 0 -34; + to, "bg"; } rel2 { - relative, 0.5 0.0; - offset, 8 0; - to, "EnticeImage"; + relative, 0.5 1.0; + offset, 32 -2; + to, "bg"; } image { - normal, "arrow_t.png"; + normal, "bt_north_1.png"; } color, 255 255 255 255; } @@ -310,18 +384,18 @@ rel1 { relative, 0.5 1.0; - offset, -8 0; - to, "EnticeImage"; + offset, 0 -34; + to, "bg"; } rel2 { relative, 0.5 1.0; - offset, 8 16; - to, "EnticeImage"; + offset, 32 -2; + to, "bg"; } image { - normal, "arrow_t.png"; + normal, "bt_north_1.png"; } color, 255 255 255 0; } @@ -331,6 +405,7 @@ name, "ButtonScrollSouth"; type, IMAGE; mouse_events, 1; + clip_to, "PanningClip"; description { state, "default" 0.0; @@ -338,18 +413,18 @@ rel1 { relative, 0.5 1.0; - offset, -8 0; - to, "EnticeImage"; + offset, 36 -34; + to, "bg"; } rel2 { relative, 0.5 1.0; - offset, 8 16; - to, "EnticeImage"; + offset, 68 -2; + to, "bg"; } image { - normal, "arrow_b.png"; + normal, "bt_south_1.png"; } color, 255 255 255 255; } @@ -360,18 +435,18 @@ rel1 { relative, 0.5 1.0; - offset, -8 0; - to, "EnticeImage"; + offset, 36 -34; + to, "bg"; } rel2 { relative, 0.5 1.0; - offset, 8 16; - to, "EnticeImage"; + offset, 68 -2; + to, "bg"; } image { - normal, "arrow_b.png"; + normal, "bt_south_1.png"; } color, 255 255 255 0; } @@ -1521,6 +1596,15 @@ { program { + name, "ShowPanning"; + signal, "mouse,in"; + source, "PanningClipMouseArea"; + action, STATE_SET "visible" 0.0; + transition, ACCELERATE 0.3; + target, "PanningClip"; + } + program + { name, "ShowPanel"; signal, "mouse,in"; source, "PanelMouseArea"; @@ -1539,19 +1623,20 @@ } program { - name, "HidePanel"; + name, "ShowImage"; signal, "mouse,in"; - source, "bg"; + source, "EnticeImage"; action, STATE_SET "default" 0.0; transition, DECELERATE 0.75; target, "PanelClip"; + target, "PanningClip"; target, "Buttons"; } program { name, "JustImage"; signal, "mouse,in"; - source, "bg"; + source, "EnticeImage"; action, STATE_SET "default" 0.0; transition, LINEAR 0.15; target, "EnticeImagePreview"; |
From: <enl...@li...> - 2003-10-17 22:01:54
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/themes/default Modified Files: default.edc Log Message: This should fix thumbnail switching from loading the new image, then disappearing and reappearing to a more sane behavior. Thumb disappears with outgoing image and reappears with new one. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/default/default.edc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- default.edc 17 Oct 2003 21:44:30 -0000 1.6 +++ default.edc 17 Oct 2003 22:01:11 -0000 1.7 @@ -2088,17 +2088,16 @@ program { name, "ShowPreview"; - signal, "EnticeImagePreviewShow"; + signal, "EnticeImagePreviewPrep"; source, ""; action, STATE_SET "default" 0.0; transition, ACCELERATE 0.1; target, "EnticeImagePreview"; - after, "ShowPreviewAfter"; } program { name, "ShowPreviewAfter"; - signal, ""; + signal, "EnticeImagePreviewShow"; source, ""; action, STATE_SET "visible" 0.0; transition, ACCELERATE 0.25; |
From: <enl...@li...> - 2003-10-18 07:01:26
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: image.c Log Message: Make fit/zoom work right. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/image.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- image.c 18 Oct 2003 02:46:23 -0000 1.27 +++ image.c 18 Oct 2003 05:22:05 -0000 1.28 @@ -340,6 +340,7 @@ if ((im = evas_object_smart_data_get(o))) { im->zoom = val; + im->fit = 0; evas_object_resize(o, im->w, im->h); } } @@ -359,6 +360,7 @@ im->zoom = ((double) (im->iw) / (double) im->w); else im->zoom = ((double) (im->ih) / (double) im->h); + im->fit = 1; entice_image_resize(o, im->w, im->h); } } @@ -375,6 +377,7 @@ if ((im = evas_object_smart_data_get(o))) { im->zoom = 1.0; + im->fit = 0; entice_image_resize(o, im->w, im->h); } } @@ -394,6 +397,7 @@ fprintf(stderr, "Zooming Out!! %0.2f\n", im->zoom); #endif im->zoom *= 1.414; + im->fit = 0; entice_image_resize(o, im->w, im->h); } @@ -416,6 +420,7 @@ im->zoom /= 1.414; if (im->zoom < 0.03125) im->zoom = 0.03125; + im->fit = 0; entice_image_resize(o, im->w, im->h); } } |
From: <enl...@li...> - 2003-10-18 07:01:28
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: main.c prefs.c prefs.h Log Message: Entice remembers its geometry and attempts placing itself back there the next time you run it. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- main.c 14 Oct 2003 18:33:29 -0000 1.14 +++ main.c 18 Oct 2003 06:59:04 -0000 1.15 @@ -44,15 +44,13 @@ static void win_resize_cb(Ecore_Evas * ee) { - int w, h; - Evas *e = NULL; - - if ((e = ecore_evas_get(ee))) + int x, y, w, h; + if (ee) { - ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); + ecore_evas_geometry_get(ee, &x, &y, &w, &h); + entice_config_geometry_set(x, y, w, h); entice_resize(w, h); } - } /** @@ -62,8 +60,12 @@ static void win_move_cb(Ecore_Evas * ee) { - return; - ee = NULL; + int x, y, w, h; + if (ee) + { + ecore_evas_geometry_get(ee, &x, &y, &w, &h); + entice_config_geometry_set(x, y, w, h); + } } /** @@ -73,6 +75,12 @@ static void win_del_cb(Ecore_Evas * ee) { + int x, y, w, h; + if (ee) + { + ecore_evas_geometry_get(ee, &x, &y, &w, &h); + entice_config_geometry_set(x, y, w, h); + } ecore_main_loop_quit(); return; ee = NULL; @@ -126,6 +134,7 @@ main(int argc, char *argv[]) { int i = 0; + int x, y, w, h; ecore_init(); ecore_app_args_set(argc, (const char **) argv); @@ -140,10 +149,11 @@ edje_frametime_set(1.0 / 60.0); entice_config_init(); + entice_config_geometry_get(&x, &y, &w, &h); if (entice_config_engine_get() == GL_X11) - ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 320, 240); + ee = ecore_evas_gl_x11_new(NULL, 0, x, y, w, h); else - ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 320, 240); + ee = ecore_evas_software_x11_new(NULL, 0, x, y, w, h); if (ee) { @@ -186,7 +196,7 @@ default: break; } - ecore_evas_resize(ee, 640, 480); + ecore_evas_move_resize(ee, x, y, w, h); ecore_evas_show(ee); ecore_main_loop_begin(); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/prefs.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- prefs.c 14 Oct 2003 18:33:29 -0000 1.4 +++ prefs.c 18 Oct 2003 06:59:04 -0000 1.5 @@ -96,6 +96,36 @@ return (result); } +void +entice_config_geometry_get(int *x, int *y, int *w, int *h) +{ + if(econfig) + { + if(x) *x = econfig->x; + if(y) *y = econfig->y; + if(w) *w = econfig->w; + if(h) *h = econfig->h; + } +} +void +entice_config_geometry_set(int x, int y, int w, int h) +{ + if(econfig) + { + char file[PATH_MAX]; + econfig->x = x; + econfig->y = y; + econfig->w = w; + econfig->h = h; + + snprintf(file, PATH_MAX, "%s/.entice.db", getenv("HOME")); + E_DB_INT_SET(file, "/entice/x", x) + E_DB_INT_SET(file, "/entice/y", y) + E_DB_INT_SET(file, "/entice/w", w) + E_DB_INT_SET(file, "/entice/h", h) + e_db_flush(); + } +} /** * entice_config_new - allocate a new 0'd out Entice_Config * Returns a valid 0'd out Entice_Config @@ -195,6 +225,14 @@ if (!e_db_int_get (db, "/entice/cache/image", &econfig->cache.image)) econfig->cache.image = 4; + if (!e_db_int_get(db, "/entice/x", &econfig->x)) + econfig->x = 0; + if (!e_db_int_get(db, "/entice/y", &econfig->y)) + econfig->y = 0; + if (!e_db_int_get(db, "/entice/w", &econfig->w)) + econfig->y = 320; + if (!e_db_int_get(db, "/entice/h", &econfig->h)) + econfig->y = 120; e_db_close(db); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/prefs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- prefs.h 14 Oct 2003 18:33:29 -0000 1.2 +++ prefs.h 18 Oct 2003 06:59:04 -0000 1.3 @@ -17,6 +17,7 @@ { int image, font; } cache; + int x, y, w, h; }; typedef struct _Entice_Config Entice_Config; @@ -27,5 +28,7 @@ int entice_config_engine_get(void); int entice_config_font_cache_get(void); int entice_config_image_cache_get(void); +void entice_config_geometry_get(int *x, int *y, int *w, int *h); +void entice_config_geometry_set(int x, int y, int w, int h); #endif |
From: <enl...@li...> - 2003-10-18 20:03:57
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/images Added Files: winter_menu.png Log Message: Confirmation dialog |
From: <enl...@li...> - 2003-10-18 20:35:26
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/themes/default Modified Files: default.edc Log Message: A small dialog box to handle file deletion =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/default/default.edc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- default.edc 17 Oct 2003 22:01:11 -0000 1.7 +++ default.edc 18 Oct 2003 20:35:04 -0000 1.8 @@ -40,6 +40,7 @@ image, "arrow_t.png" LOSSY 95; image, "arrow_b.png" LOSSY 95; image, "preview_bg.png" LOSSY 95; + image, "winter_menu.png" LOSSY 95; } collections { @@ -1591,6 +1592,258 @@ } } } + part + { + name, "DeleteDialogClip"; + type, RECT; + mouse_events, 0; + description + { + state, "default" 0.0; + visible, 1; + rel1 + { + relative, 1.0 0.0; + offset, 0 0; + } + rel2 + { + relative, 1.0 0.0; + offset, 0 0; + } + color, 255 255 255 0; + } + description + { + state, "visible" 0.0; + visible, 1; + rel1 + { + relative, 0.5 0.5; + offset, -180 -45; + to, "bg"; + } + rel2 + { + relative, 0.5 0.5; + offset, 180 45; + to, "bg"; + } + color, 255 255 255 255; + } + } + part + { + name, "DeleteDialogBg"; + type, IMAGE; + mouse_events, 0; + clip_to, "DeleteDialogClip"; + description + { + state, "default" 0.0; + visible, 1; + rel1 + { + relative, 0.0 0.0; + offset, 0 0; + to, "DeleteDialogClip"; + } + rel2 + { + relative, 1.0 1.0; + offset, 0 0; + to, "DeleteDialogClip"; + } + image + { + normal, "winter_menu.png"; + } + color, 255 255 255 255; + } + } + part + { + name, "DeleteFromFS"; + type, TEXT; + mouse_events, 1; + clip_to, "DeleteDialogClip"; + description + { + state, "default" 0.0; + visible, 1; + rel1 + { + relative, 0.0 0.0; + offset, 10 10; + to, "DeleteDialogBg"; + } + rel2 + { + relative, 1.0 0.0; + offset, -10 30; + to, "DeleteDialogBg"; + } + color, 100 100 100 255; + color3, 229 229 229 128; + text + { + text, "Delete image on disk?"; + font, "Vera"; + size, 16; + fit, 0 0; + align, 0.5 0.5; + } + } + description + { + state, "selected" 0.0; + visible, 1; + rel1 + { + relative, 0.0 0.0; + offset, 10 10; + to, "DeleteDialogBg"; + } + rel2 + { + relative, 1.0 0.0; + offset, -10 30; + to, "DeleteDialogBg"; + } + color, 100 100 100 128; + color3, 229 229 229 255; + text + { + text, "Delete image on disk?"; + font, "Vera"; + size, 16; + fit, 0 0; + align, 0.5 0.5; + } + } + } + part + { + name, "DeleteFromEntice"; + type, TEXT; + mouse_events, 1; + clip_to, "DeleteDialogClip"; + description + { + state, "default" 0.0; + visible, 1; + rel1 + { + relative, 0.0 1.0; + offset, 0 3; + to, "DeleteFromFS"; + } + rel2 + { + relative, 1.0 1.0; + offset, 0 28; + to, "DeleteFromFS"; + } + color, 100 100 100 255; + color3, 229 229 229 128; + text + { + text, "Delete image from entice?"; + font, "Vera"; + size, 16; + fit, 0 0; + align, 0.5 0.5; + } + } + description + { + state, "selected" 0.0; + visible, 1; + rel1 + { + relative, 0.0 1.0; + offset, 0 3; + to, "DeleteFromFS"; + } + rel2 + { + relative, 1.0 1.0; + offset, 0 28; + to, "DeleteFromFS"; + } + color, 100 100 100 128; + color3, 229 229 229 255; + text + { + text, "Delete image from entice?"; + font, "Vera"; + size, 16; + fit, 0 0; + align, 0.5 0.5; + } + } + } + part + { + name, "DeleteDialogCancel"; + type, TEXT; + mouse_events, 1; + clip_to, "DeleteDialogClip"; + description + { + state, "default" 0.0; + visible, 1; + rel1 + { + relative, 0.0 1.0; + offset, 0 3; + to, "DeleteFromEntice"; + } + rel2 + { + relative, 1.0 1.0; + offset, 0 28; + to, "DeleteFromEntice"; + } + color, 100 100 100 255; + color3, 229 229 229 128; + text + { + text, "Cancel"; + font, "Vera"; + size, 16; + fit, 0 0; + align, 0.5 0.5; + } + } + description + { + state, "selected" 0.0; + visible, 1; + rel1 + { + relative, 0.0 1.0; + offset, 0 3; + to, "DeleteFromEntice"; + } + rel2 + { + relative, 1.0 1.0; + offset, 0 25; + to, "DeleteFromEntice"; + } + color, 100 100 100 128; + color3, 229 229 229 255; + text + { + text, "Cancel"; + font, "Vera"; + size, 16; + fit, 0 0; + align, 0.5 0.5; + } + } + } } programs { @@ -1760,7 +2013,43 @@ name, "DeleteImageRequest"; signal, "mouse,clicked,1"; source, "ButtonDeleteImage"; + action, STATE_SET "visible" 0.0; + target, "DeleteDialogClip"; + transition, LINEAR 0.3; + } + program + { + name, "DeleteCancelRequest"; + signal, "mouse,clicked,1"; + source, "DeleteDialogCancel"; + action, STATE_SET "default" 0.0; + target, "DeleteDialogClip"; + transition, LINEAR 0.3; + } + program + { + name, "DeleteFileFromFSRequest"; + signal, "mouse,clicked,1"; + source, "DeleteFromFS"; action, SIGNAL_EMIT "EnticeDeleteCurrent" ""; + after, "DeleteDialogHide"; + } + program + { + name, "DeleteFileFromEnticeRequest"; + signal, "mouse,clicked,1"; + source, "DeleteFromEntice"; + action, SIGNAL_EMIT "EnticeRemoveCurrent" ""; + after, "DeleteDialogHide"; + } + program + { + name, "DeleteDialogHide"; + signal, ""; + source, ""; + action, STATE_SET "default" 0.0; + target, "DeleteDialogClip"; + transition, LINEAR 0.3; } program { |
From: <enl...@li...> - 2003-10-18 20:39:04
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: entice.c entice.h main.c prefs.c signals_image.c Log Message: file deletion works. You can remove the current image from entice's list or delete it completely from disk. It'll automatically load the next image if deletion/removal is successful. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- entice.c 17 Oct 2003 21:36:08 -0000 1.7 +++ entice.c 18 Oct 2003 20:38:55 -0000 1.8 @@ -362,12 +362,39 @@ } } +void +entice_delete_current(void) +{ + if (entice && entice->current) + { + int result = 0; + + result = entice_file_delete(entice_image_file_get(entice->current)); + + if (!result) + edje_object_signal_emit(entice->edje, "EnticeImageNext", ""); + } +} +void +entice_remove_current(void) +{ + if (entice && entice->current) + { + int result = 0; + + result = entice_file_remove(entice_image_file_get(entice->current)); + if (!result) + edje_object_signal_emit(entice->edje, "EnticeImageNext", ""); + } + +} + /** - * entice_fil_del - delete the file from our image list + * entice_file_remove - remove the file from our image list * @file - the filename we want to nuke */ int -entice_file_del(const char *file) +entice_file_remove(const char *file) { int result = 0; Evas_Object *o = NULL; @@ -376,63 +403,52 @@ if (file) { snprintf(buf, PATH_MAX, "%s", file); - if ((ptr = realpath(buf, path))) + if ((o = evas_hash_find(entice->thumb.hash, buf))) { - if ((o = evas_hash_find(entice->thumb.hash, path))) - { - entice->thumb.list = evas_list_remove(entice->thumb.list, o); - entice->thumb.hash = evas_hash_del(entice->thumb.hash, path, o); - /* FIXME container_vomit(o); */ + entice->thumb.list = evas_list_remove(entice->thumb.list, o); + entice->thumb.hash = evas_hash_del(entice->thumb.hash, buf, o); + e_container_element_remove(entice->container, o); + evas_object_del(o); + /* FIXME container_vomit(o); */ #if 0 - e_thumb_free(o); + e_thumb_free(o); #endif - } - else - result = 1; } else - result = 2; + result = 1; } else - result = 3; + result = 2; return (result); } /** - * entice_file_del_from_fs - delete the file from our list, and off disk + * entice_file_delete - delete the file from our list, and off disk * @file - the filename of the image we wanna nuke */ int -entice_file_del_from_fs(const char *file) +entice_file_delete(const char *file) { int result = 0; Evas_Object *o = NULL; - char buf[PATH_MAX], path[PATH_MAX], *ptr = NULL; + char buf[PATH_MAX]; if (file) { snprintf(buf, PATH_MAX, "%s", file); - if ((ptr = realpath(buf, path))) + if ((o = evas_hash_find(entice->thumb.hash, buf))) { - if ((o = evas_hash_find(entice->thumb.hash, path))) - { - entice->thumb.list = evas_list_remove(entice->thumb.list, o); - entice->thumb.hash = evas_hash_del(entice->thumb.hash, path, o); - /* FIXME container_vomit(o); */ -#if 0 - e_thumb_free(o); - unlink(path); - -#endif - } - else - result = 1; + entice->thumb.list = evas_list_remove(entice->thumb.list, o); + entice->thumb.hash = evas_hash_del(entice->thumb.hash, buf, o); + e_container_element_remove(entice->container, o); + evas_object_del(o); + unlink(buf); } else - result = 2; + result = 1; } else - result = 3; + result = 2; return (result); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- entice.h 14 Oct 2003 18:33:29 -0000 1.10 +++ entice.h 18 Oct 2003 20:38:55 -0000 1.11 @@ -66,5 +66,7 @@ void entice_flip_horizontal(void); void entice_preview_thumb(Evas_Object * o); +void entice_delete_current(void); +void entice_remove_current(void); #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/main.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- main.c 18 Oct 2003 06:59:04 -0000 1.15 +++ main.c 18 Oct 2003 20:38:55 -0000 1.16 @@ -45,6 +45,7 @@ win_resize_cb(Ecore_Evas * ee) { int x, y, w, h; + if (ee) { ecore_evas_geometry_get(ee, &x, &y, &w, &h); @@ -61,6 +62,7 @@ win_move_cb(Ecore_Evas * ee) { int x, y, w, h; + if (ee) { ecore_evas_geometry_get(ee, &x, &y, &w, &h); @@ -76,6 +78,7 @@ win_del_cb(Ecore_Evas * ee) { int x, y, w, h; + if (ee) { ecore_evas_geometry_get(ee, &x, &y, &w, &h); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/prefs.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- prefs.c 18 Oct 2003 18:09:24 -0000 1.6 +++ prefs.c 18 Oct 2003 20:38:55 -0000 1.7 @@ -99,33 +99,39 @@ void entice_config_geometry_get(int *x, int *y, int *w, int *h) { - if(econfig) - { - if(x) *x = econfig->x; - if(y) *y = econfig->y; - if(w) *w = econfig->w; - if(h) *h = econfig->h; - } + if (econfig) + { + if (x) + *x = econfig->x; + if (y) + *y = econfig->y; + if (w) + *w = econfig->w; + if (h) + *h = econfig->h; + } } void entice_config_geometry_set(int x, int y, int w, int h) { - if(econfig) - { - char file[PATH_MAX]; - econfig->x = x; - econfig->y = y; - econfig->w = w; - econfig->h = h; - - snprintf(file, PATH_MAX, "%s/.entice.db", getenv("HOME")); - E_DB_INT_SET(file, "/entice/x", x) - E_DB_INT_SET(file, "/entice/y", y) - E_DB_INT_SET(file, "/entice/w", w) - E_DB_INT_SET(file, "/entice/h", h) - e_db_flush(); - } + if (econfig) + { + char file[PATH_MAX]; + + econfig->x = x; + econfig->y = y; + econfig->w = w; + econfig->h = h; + + snprintf(file, PATH_MAX, "%s/.entice.db", getenv("HOME")); + E_DB_INT_SET(file, "/entice/x", x); + E_DB_INT_SET(file, "/entice/y", y); + E_DB_INT_SET(file, "/entice/w", w); + E_DB_INT_SET(file, "/entice/h", h); + e_db_flush(); + } } + /** * entice_config_new - allocate a new 0'd out Entice_Config * Returns a valid 0'd out Entice_Config @@ -228,13 +234,13 @@ (db, "/entice/cache/image", &econfig->cache.image)) econfig->cache.image = 4; if (!e_db_int_get(db, "/entice/x", &econfig->x)) - econfig->x = 0; + econfig->x = 0; if (!e_db_int_get(db, "/entice/y", &econfig->y)) - econfig->y = 0; + econfig->y = 0; if (!e_db_int_get(db, "/entice/w", &econfig->w)) - econfig->y = 320; + econfig->y = 320; if (!e_db_int_get(db, "/entice/h", &econfig->h)) - econfig->y = 240; + econfig->y = 240; e_db_close(db); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/signals_image.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- signals_image.c 14 Oct 2003 18:33:29 -0000 1.4 +++ signals_image.c 18 Oct 2003 20:38:55 -0000 1.5 @@ -10,6 +10,7 @@ _entice_delete_current(void *data, Evas_Object * o, const char *emission, const char *source) { + entice_delete_current(); return; data = NULL; o = NULL; @@ -22,6 +23,7 @@ _entice_remove_current(void *data, Evas_Object * o, const char *emission, const char *source) { + entice_remove_current(); return; data = NULL; o = NULL; |
From: <enl...@li...> - 2003-10-18 21:05:43
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice Modified Files: README.theme Log Message: Namespace cleanup was necessary, plus new parts/signals =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/README.theme,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- README.theme 14 Oct 2003 16:45:00 -0000 1.3 +++ README.theme 18 Oct 2003 21:02:54 -0000 1.4 @@ -17,57 +17,75 @@ EnticeThumbPreview "" Send thumb to the previewer EnticeThumbLoad "" Load this thumbnail as the current image. +EnticeThumbDelete "" Delete the thumbnail + from entice and off disk +EnticeThumbRemove "" Remove the thumbnail + from entice /*========================================================================*/ Entice: -parts(states) type -EnticeFileName(default) TEXT -EnticeFileSize(default) TEXT -EnticeImageDimensions(default) TEXT maybe one each for width and height +parts type +----- ---- +EnticeFileName TEXT full path to image +EnticeFileShortName TEXT only filename +EnticeFileSize TEXT filesize in KB or MB +EnticeImageDimensions TEXT widthxheight +EnticeImageHeight TEXT just height in pixels +EnticeImageWidth TEXT just width in pixels EnticeImage swallowed the main image display -EnticeImageScroller swallowed the bottom-right corner +EnticeImageScroller swallowed area visible relative to + screen size, high level + magnifying glass + (NEEDS WORK) EnticeImagePreview swallowed Preview an image before loading EnticeThumbnailArea swallowed Thumbnail container signals emitted by entice: +signal source description +------ ------ ----------- EnticeImageDisplay "" when a new image is displayed +EnticeImageModified "" When the image in memory is no longer + is consistent with the disk image +EnticeImagePreviewPrep "" Emitted before, preview show + attempts loading +EnticeImagePreviewShow "" when we have previewed a new + image signals understood by entice: signal source description -EnticeDeleteCurrent "" deletes the current image from the disk -EnticeRemoveCurrent "" removes the current image from the image list -EnticeSaveCurrent "" save the image to disk +------ ------ ----------- +/* Things you can do to the image */ +EnticeImageDelete "" deletes the current image from the disk +EnticeImageRemove "" removes the current image from the image list +EnticeImageSave "" save the image to disk EnticeImageNext "" shows the next image in the list EnticeImagePrev "" shows the previous image in the list -EnticeZoomDefault "" zooms 1:1 -EnticeZoomFit "" zooms so the image fits the screen -EnticeZoomIn "" zooms in -EnticeZoomOut "" zooms out -EnticeZoomInFocused "" zooms in focused on the current mouse x,y -EnticeZoomOutFocused "" zooms out focused on the current mouse x,y -EnticeFitWindow "" resizes the window to fit the image -EnticeRotateRight "" rotates the image 90deg clockwise -EnticeRotateLeft "" I'm sure you can guess this one -EnticeFlipH "" flips left <-> right -EnticeFlipV "" flips top <-> bottom -EnticeFullScreen "" switches to/from fullscreen mode -EnticeQuit "" exits entice +EnticeImageZoomDefault "" zooms 1:1 +EnticeImageZoomFit "" zooms so the image fits the screen +EnticeImageZoomIn "" zooms in +EnticeImageZoomOut "" zooms out +EnticeImageZoomInFocused "" zooms in focused on the current mouse x,y +EnticeImageZoomOutFocused "" zooms out focused on the current mouse x,y +EnticeImageFitWindow "" resizes the window to fit the image +EnticeImageRotateRight "" rotates the image 90deg clockwise +EnticeImageRotateLeft "" I'm sure you can guess this one +EnticeImageFlipH "" flips left <-> right +EnticeImageFlipV "" flips top <-> bottom +/* For Panning across the image */ EnticeImageScrollEastStart "" start scrolling the image right EnticeImageScrollSouthStart "" start scrolling the image down EnticeImageScrollWestStart "" start scrolling the image left EnticeImageScrollNorthStart "" start scrolling the image upwards -EnticeImageScrollStop "" stop image directional scrolling +EnticeImageScrollStop "" stop image directional scrolling +/* For Scrolling the thumbnail area */ EnticeThumbsScrollNextStart "" start scrolling down the thumbnailer EnticeThumbsScrollPrevStart "" start scrolling up the thumbnailer EnticeThumbsScrollStop "" stop scrolling in either direction -EnticeImageModified "" When the image in memory is no longer - is consistent with the disk image -EnticeImagePreviewPrep "" Emitted before, preview show - attempts loading -EnticeImagePreviewShow "" when we have previewed a new - image +EnticeFullScreen "" switches to/from fullscreen mode +EnticeQuit "" exits entice + /*========================================================================*/ |
From: <enl...@li...> - 2003-10-19 04:20:29
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: entice.c Log Message: Deleting works properly now. There were remnants left in the iconbar that weren't getting properly erased. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- entice.c 18 Oct 2003 20:38:55 -0000 1.8 +++ entice.c 19 Oct 2003 04:19:23 -0000 1.9 @@ -296,8 +296,6 @@ if ((o = e_thumb_new(ecore_evas_get(entice->ee), path))) { entice->thumb.list = evas_list_append(entice->thumb.list, o); - entice->thumb.hash = evas_hash_add(entice->thumb.hash, path, o); - evas_object_show(o); evas_object_resize(o, 48, 48); edje = edje_object_add(ecore_evas_get(entice->ee)); @@ -306,6 +304,10 @@ hookup_entice_thumb_signals(edje, o); edje_object_part_swallow(edje, "EnticeThumb", o); evas_object_show(edje); + evas_object_show(o); + + entice->thumb.hash = + evas_hash_add(entice->thumb.hash, path, edje); e_container_element_append(entice->container, edje); if (evas_list_count(entice->thumb.list) == 1) @@ -397,22 +399,29 @@ entice_file_remove(const char *file) { int result = 0; - Evas_Object *o = NULL; - char buf[PATH_MAX], path[PATH_MAX], *ptr = NULL; + char buf[PATH_MAX]; + Evas_Object *o = NULL, *obj = NULL; if (file) { snprintf(buf, PATH_MAX, "%s", file); if ((o = evas_hash_find(entice->thumb.hash, buf))) { - entice->thumb.list = evas_list_remove(entice->thumb.list, o); entice->thumb.hash = evas_hash_del(entice->thumb.hash, buf, o); + if (entice->thumb.current && entice->thumb.current->prev) + entice->thumb.current = entice->thumb.current->prev; + else if (entice->thumb.list) + entice->thumb.current = entice->thumb.list; + + if ((obj = edje_object_part_swallow_get(o, "EnticeThumb"))) + { + entice->thumb.list = evas_list_remove(entice->thumb.list, obj); + evas_object_del(obj); + } e_container_element_remove(entice->container, o); evas_object_del(o); - /* FIXME container_vomit(o); */ -#if 0 - e_thumb_free(o); -#endif + if (evas_list_count(entice->thumb.list) == 0) + entice->thumb.current = NULL; } else result = 1; @@ -436,16 +445,9 @@ if (file) { snprintf(buf, PATH_MAX, "%s", file); - if ((o = evas_hash_find(entice->thumb.hash, buf))) - { - entice->thumb.list = evas_list_remove(entice->thumb.list, o); - entice->thumb.hash = evas_hash_del(entice->thumb.hash, buf, o); - e_container_element_remove(entice->container, o); - evas_object_del(o); + result = entice_file_remove(buf); + if (!result) unlink(buf); - } - else - result = 1; } else result = 2; |
From: <enl...@li...> - 2003-10-19 04:29:50
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/images Modified Files: bt_north_1.png bt_south_1.png Log Message: try to make these look a little more like the other buttons =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/images/bt_north_1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsUdaULn and /tmp/cvsKcEJlB differ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/images/bt_south_1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsShcGtq and /tmp/cvsqMgSJG differ |
From: <enl...@li...> - 2003-10-19 04:53:24
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: image.c Log Message: TrillMonkey pointed out bad mouse wheel handling =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/image.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- image.c 18 Oct 2003 05:22:05 -0000 1.28 +++ image.c 19 Oct 2003 00:58:23 -0000 1.29 @@ -878,7 +878,11 @@ { if ((o = (Evas_Object *) data)) { - evas_event_feed_mouse_wheel_data(e, ev->direction, ev->z, o); + char buf[PATH_MAX]; + + snprintf(buf, PATH_MAX, "mouse,wheel,%i,%i", (int) ev->direction, + (int) ev->z); + edje_object_signal_emit(o, buf, "EnticeImage"); } } #if DEBUG |
From: <enl...@li...> - 2003-10-19 05:53:50
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: image.c Log Message: Hush some printfs =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/image.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- image.c 17 Oct 2003 21:36:08 -0000 1.26 +++ image.c 18 Oct 2003 02:46:23 -0000 1.27 @@ -11,7 +11,7 @@ #include <Ecore.h> #include "image.h" -#define DEBUG 1 +#define DEBUG 0 static void entice_image_resize(Evas_Object * o, double w, double h); static int _entice_image_scroll_timer(void *data); |
From: <enl...@li...> - 2003-10-19 06:44:33
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: image.c Log Message: retain image alpha during save routines. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/image.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- image.c 19 Oct 2003 00:58:23 -0000 1.29 +++ image.c 19 Oct 2003 01:13:19 -0000 1.30 @@ -175,6 +175,8 @@ imlib_context_set_image(imlib_im); if (im->format && im->filename) { + imlib_image_set_has_alpha((char) + evas_object_image_alpha_get(im->obj)); imlib_image_set_format(im->format); imlib_save_image(im->filename); } |
From: <enl...@li...> - 2003-10-19 08:37:02
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: prefs.c Log Message: More sane default values if you've never run entice before. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/prefs.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- prefs.c 18 Oct 2003 06:59:04 -0000 1.5 +++ prefs.c 18 Oct 2003 18:09:24 -0000 1.6 @@ -142,6 +142,8 @@ memset(result, 0, sizeof(Entice_Config)); snprintf(buf, PATH_MAX, "%s/default.eet", PACKAGE_DATA_DIR); result->theme = strdup(buf); + result->w = 320; + result->h = 240; } return (result); } @@ -232,7 +234,7 @@ if (!e_db_int_get(db, "/entice/w", &econfig->w)) econfig->y = 320; if (!e_db_int_get(db, "/entice/h", &econfig->h)) - econfig->y = 120; + econfig->y = 240; e_db_close(db); } |
From: <enl...@li...> - 2003-10-19 17:23:43
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/themes/default Modified Files: default.edc Log Message: Update theme to the new part namespace =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/default/default.edc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- default.edc 18 Oct 2003 20:35:04 -0000 1.8 +++ default.edc 19 Oct 2003 17:07:42 -0000 1.9 @@ -1978,28 +1978,28 @@ name, "ZoomNormalRequest"; signal, "mouse,clicked,1"; source, "ButtonZoomNormal"; - action, SIGNAL_EMIT "EnticeZoomDefault" ""; + action, SIGNAL_EMIT "EnticeImageZoomDefault" ""; } program { name, "ZoomInRequest"; signal, "mouse,clicked,1"; source, "ButtonZoomIn"; - action, SIGNAL_EMIT "EnticeZoomIn" ""; + action, SIGNAL_EMIT "EnticeImageZoomIn" ""; } program { name, "ZoomOutRequest"; signal, "mouse,clicked,1"; source, "ButtonZoomOut"; - action, SIGNAL_EMIT "EnticeZoomOut" ""; + action, SIGNAL_EMIT "EnticeImageZoomOut" ""; } program { name, "ExpandRequest"; signal, "mouse,clicked,1"; source, "ButtonExpandImage"; - action, SIGNAL_EMIT "EnticeZoomFit" ""; + action, SIGNAL_EMIT "EnticeImageZoomFit" ""; } program { @@ -2031,7 +2031,7 @@ name, "DeleteFileFromFSRequest"; signal, "mouse,clicked,1"; source, "DeleteFromFS"; - action, SIGNAL_EMIT "EnticeDeleteCurrent" ""; + action, SIGNAL_EMIT "EnticeImageDelete" ""; after, "DeleteDialogHide"; } program @@ -2039,7 +2039,7 @@ name, "DeleteFileFromEnticeRequest"; signal, "mouse,clicked,1"; source, "DeleteFromEntice"; - action, SIGNAL_EMIT "EnticeRemoveCurrent" ""; + action, SIGNAL_EMIT "EnticeImageRemove" ""; after, "DeleteDialogHide"; } program @@ -2056,21 +2056,21 @@ name, "SaveImageRequest"; signal, "mouse,clicked,1"; source, "ButtonSaveImage"; - action, SIGNAL_EMIT "EnticeSaveCurrent" ""; + action, SIGNAL_EMIT "EnticeImageSave" ""; } program { name, "RotateRightImageRequest"; signal, "mouse,clicked,1"; source, "ButtonRotateRight"; - action, SIGNAL_EMIT "EnticeRotateRight" ""; + action, SIGNAL_EMIT "EnticeImageRotateRight" ""; } program { name, "RotateLeftImageRequest"; signal, "mouse,clicked,1"; source, "ButtonRotateLeft"; - action, SIGNAL_EMIT "EnticeRotateLeft" ""; + action, SIGNAL_EMIT "EnticeImageRotateLeft" ""; } program { |
From: <enl...@li...> - 2003-10-19 17:32:38
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: entice.c signals_image.c Log Message: Mark two things off of the todo list Update backend to new namespace for theme parts =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- entice.c 19 Oct 2003 04:19:23 -0000 1.9 +++ entice.c 19 Oct 2003 17:20:49 -0000 1.10 @@ -36,20 +36,20 @@ const char *source); } edje_callbacks; - char *signals[] = { "EnticeDeleteCurrent", "EnticeRemoveCurrent", + char *signals[] = { "EnticeImageDelete", "EnticeImageRemove", "EnticeImageNext", "EnticeImagePrev", - "EnticeZoomIn", "EnticeZoomOut", - "EnticeZoomInFocused", "EnticeZoomOutFocused", - "EnticeZoomDefault", "EnticeZoomFit", - "EnticeFitWindow", "EnticeRotateLeft", - "EnticeRotateRight", "EnticeFlipH", - "EnticeFlipV", "EnticeFullScreen", + "EnticeImageZoomIn", "EnticeImageZoomOut", + "EnticeImageZoomInFocused", "EnticeImageZoomOutFocused", + "EnticeImageZoomDefault", "EnticeImageZoomFit", + "EnticeImageFitWindow", "EnticeImageRotateLeft", + "EnticeImageRotateRight", "EnticeImageFlipHorizontal", + "EnticeImageFlipVertical", "EnticeFullScreen", "EnticeThumbsScrollNextStart", "EnticeThumbsScrollPrevStart", "EnticeThumbsScrollStop", "EnticeImageScrollEastStart", "EnticeImageScrollWestStart", "EnticeImageScrollNorthStart", "EnticeImageScrollSouthStart", "EnticeImageScrollStop", "EnticeImageModified", - "EnticeSaveCurrent", "EnticeQuit" + "EnticeImageSave", "EnticeQuit" }; edje_callbacks funcs[] = { _entice_delete_current, _entice_remove_current, _entice_image_next, _entice_image_prev, =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/signals_image.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- signals_image.c 18 Oct 2003 20:38:55 -0000 1.5 +++ signals_image.c 19 Oct 2003 17:20:49 -0000 1.6 @@ -5,7 +5,7 @@ #define DEBUG 0 -/* EnticeDeleteCurrent */ +/* EnticeImageDelete*/ void _entice_delete_current(void *data, Evas_Object * o, const char *emission, const char *source) @@ -18,7 +18,7 @@ source = NULL; } -/* EnticeRemoveCurrent */ +/* EnticeImageRemove*/ void _entice_remove_current(void *data, Evas_Object * o, const char *emission, const char *source) @@ -57,7 +57,7 @@ source = NULL; } -/* EnticeZoomIn */ +/* EnticeImageZoomIn */ void _entice_zoom_in(void *data, Evas_Object * o, const char *emission, const char *source) @@ -70,7 +70,7 @@ source = NULL; } -/* EnticeZoomOut */ +/* EnticeImageZoomOut */ void _entice_zoom_out(void *data, Evas_Object * o, const char *emission, const char *source) @@ -83,7 +83,7 @@ source = NULL; } -/* EnticeZoomDefault */ +/* EnticeImageZoomDefault */ void _entice_zoom_default(void *data, Evas_Object * o, const char *emission, const char *source) @@ -96,7 +96,7 @@ source = NULL; } -/* EnticeZoomFit */ +/* EnticeImageZoomFit */ void _entice_zoom_fit(void *data, Evas_Object * o, const char *emission, const char *source) @@ -109,7 +109,7 @@ source = NULL; } -/* EnticeZoomInFocused */ +/* EnticeImageZoomInFocused */ /* 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, @@ -122,7 +122,7 @@ source = NULL; } -/* EnticeZoomOutFocused */ +/* EnticeImageZoomOutFocused */ /* 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, @@ -136,8 +136,8 @@ } /* FIXME: I'm not sure how to do this with edje - * README.theme states EnticeFitWindow should resize the window to fit the - * image, for now I"m omitting this feature. + * README.theme states EnticeImageFitWindow should resize the window to + * fit the image, for now I"m omitting this feature. */ void _entice_fit_window(void *data, Evas_Object * o, const char *emission, @@ -150,7 +150,7 @@ source = NULL; } -/* EnticeRotateLeft */ +/* EnticeImageRotateLeft */ void _entice_rotate_left(void *data, Evas_Object * o, const char *emission, const char *source) @@ -163,7 +163,7 @@ source = NULL; } -/* EnticeRotateRight */ +/* EnticeImageRotateRight */ void _entice_rotate_right(void *data, Evas_Object * o, const char *emission, const char *source) @@ -176,7 +176,7 @@ source = NULL; } -/* EnticeFlipHorizontal */ +/* EnticeImageFlipH */ void _entice_flip_horizontal(void *data, Evas_Object * o, const char *emission, const char *source) @@ -189,7 +189,7 @@ source = NULL; } -/* EnticeFlipVertical */ +/* EnticeImageFlipV */ void _entice_flip_vertical(void *data, Evas_Object * o, const char *emission, const char *source) @@ -359,7 +359,7 @@ source = NULL; } -/* EnticeSaveCurrent */ +/* EnticeImageSave */ void _entice_image_save(void *data, Evas_Object * o, const char *emission, const char *source) |
From: <enl...@li...> - 2003-10-19 17:45:16
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice Modified Files: TODO Log Message: Mark two things off of the todo list Update backend to new namespace for theme parts =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/TODO,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- TODO 14 Oct 2003 13:05:24 -0000 1.2 +++ TODO 19 Oct 2003 17:20:48 -0000 1.3 @@ -1,9 +1,5 @@ Still left TODO -* Save Routine - for modified images, shouldn't be an option unless image - has been modified(i.e. rotated) - Add an "EnticeImageModified" Signal - * Add an entice-ish display mode to the container object in e17/proto/esmart @@ -13,8 +9,6 @@ * Find a way to represent, what's visible currently, to the EnticeScroller - -* Hook in delete callbacks, should be pretty easy * Trash Can ? Somehow i missed this functionality in the old version |
From: <enl...@li...> - 2003-10-19 18:46:13
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/themes/default Modified Files: default.edc Log Message: - Added signals to EnticeThumb that let thumbs know if they've been selected or not.(non-selected are currently faded-out slightly) - Added mouse wheel zooming to the theme. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/default/default.edc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- default.edc 19 Oct 2003 17:07:42 -0000 1.9 +++ default.edc 19 Oct 2003 18:02:21 -0000 1.10 @@ -2432,6 +2432,20 @@ target, "EnticeButtonSaveImagePulseDown"; target, "EnticeButtonSaveImagePulseUp"; } + program + { + name, "MouseWheelZoomerInner"; + signal, "mouse,wheel,0,1"; + source, "EnticeImage"; + action, SIGNAL_EMIT "EnticeImageZoomIn" ""; + } + program + { + name, "MouseWheelZoomerOuter"; + signal, "mouse,wheel,0,-1"; + source, "EnticeImage"; + action, SIGNAL_EMIT "EnticeImageZoomOut" ""; + } } } group @@ -2441,9 +2455,48 @@ { part { + name, "ThumbClip" + type, RECT; + mouse_events, 1; + description + { + state, "default" 0.0; + visible, 1; + rel1 + { + relative, 0.0 0.0; + offset, 0 0; + } + rel2 + { + relative, 1.0 1.0; + offset, 0 0; + } + color, 255 255 255 128; + } + description + { + state, "selected" 0.0; + visible, 1; + rel1 + { + relative, 0.0 0.0; + offset, 0 0; + } + rel2 + { + relative, 1.0 1.0; + offset, 0 0; + } + color, 255 255 255 255; + } + } + part + { name, "EnticeThumb" type, IMAGE; mouse_events, 1; + clip_to, "ThumbClip"; description { state, "default" 0.0; @@ -2458,6 +2511,7 @@ relative, 1.0 1.0; offset, 0 0; } + color, 255 255 255 128; } } } @@ -2485,6 +2539,24 @@ signal, "mouse,up,1"; source, "EnticeThumb"; action, SIGNAL_EMIT "EnticeThumbLoad" ""; + } + program + { + name, "ThumbSelected"; + signal, "EnticeThumbLoaded"; + source, ""; + action, STATE_SET "selected" 0.0; + transition, SINUSOIDAL 0.3; + target, "ThumbClip"; + } + program + { + name, "ThumbUnSelected"; + signal, "EnticeThumbUnLoaded"; + source, ""; + action, STATE_SET "default" 0.0; + transition, SINUSOIDAL 0.3; + target, "ThumbClip"; } } } |
From: <enl...@li...> - 2003-10-19 19:28:01
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice Modified Files: README.theme Log Message: - Added signals to EnticeThumb that let thumbs know if they've been selected or not.(non-selected are currently faded-out slightly) - Added mouse wheel zooming to the theme. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/README.theme,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- README.theme 18 Oct 2003 21:02:54 -0000 1.4 +++ README.theme 19 Oct 2003 18:02:21 -0000 1.5 @@ -17,6 +17,10 @@ EnticeThumbPreview "" Send thumb to the previewer EnticeThumbLoad "" Load this thumbnail as the current image. +EnticeThumbLoaded "" Thumbnail was + selected in entice. +EnticeThumbUnLoaded "" Thumbnail was + de-selected in entice. EnticeThumbDelete "" Delete the thumbnail from entice and off disk EnticeThumbRemove "" Remove the thumbnail |
From: <enl...@li...> - 2003-10-19 19:49:39
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/src/bin Modified Files: entice.c Log Message: - Added signals to EnticeThumb that let thumbs know if they've been selected or not.(non-selected are currently faded-out slightly) - Added mouse wheel zooming to the theme. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- entice.c 19 Oct 2003 17:20:49 -0000 1.10 +++ entice.c 19 Oct 2003 18:02:22 -0000 1.11 @@ -181,6 +181,7 @@ Evas_Object *o = NULL; Evas_Object *tmp = NULL; Evas_Object *new_current = NULL, *new_scroller; + Evas_Object *thumb_edje = NULL; if ((o = (Evas_Object *) _data)) { @@ -193,6 +194,10 @@ && !strcmp(e_thumb_file_get(o), entice_image_file_get(entice->current))) return; + if((thumb_edje = evas_hash_find(entice->thumb.hash, + entice_image_file_get(entice->current)))) + edje_object_signal_emit(thumb_edje, "EnticeThumbUnLoaded", + ""); tmp = e_thumb_evas_object_get(o); new_current = entice_image_new(tmp); @@ -242,6 +247,9 @@ } } entice->current = new_current; + if((thumb_edje = evas_hash_find(entice->thumb.hash, + entice_image_file_get(entice->current)))) + edje_object_signal_emit(thumb_edje, "EnticeThumbLoaded", ""); if (entice->scroller) evas_object_del(entice->scroller); |