Enlightenment CVS committal

Author  : atmosphere
Project : e17
Module  : apps/entice

Dir     : e17/apps/entice/data/themes/default


Modified Files:
        default.edc 


Log Message:
updates, recent changes to edje made the buttons look weird
some tidying with packing macros to make modifying all the buttons at once
easier.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/default/default.edc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- default.edc 23 Dec 2003 10:56:41 -0000      1.15
+++ default.edc 28 Dec 2003 08:58:28 -0000      1.16
@@ -562,7 +562,7 @@
                    rel2
                    {
                        relative, 1.0 0.0;
-                       offset, 0 73;
+                       offset, 0 80;
                        to, "bg";
                    }
                    color, 255 255 255 0;
@@ -580,7 +580,7 @@
                    rel2
                    {
                        relative, 1.0 0.0;
-                       offset, 0 73;
+                       offset, 0 80;
                        to, "bg";
                    }
                    color, 255 255 255 0;
@@ -676,13 +676,13 @@
                    rel1
                    {
                        relative, 0.0 1.0;
-                       offset, 0 -32;
+                       offset, 0 -35;
                        to, "Panel";
                    }
                    rel2
                    {
                        relative, 1.0 1.0;
-                       offset, 0 0;
+                       offset, 0 -3;
                        to, "Panel";
                    }
                    image 
@@ -697,13 +697,13 @@
                    rel1
                    {
                        relative, 0.0 1.0;
-                       offset, 0 -32;
+                       offset, 0 -35;
                        to, "Panel";
                    }
                    rel2
                    {
                        relative, 1.0 1.0;
-                       offset, 0 0;
+                       offset, 0 -3;
                        to, "Panel";
                    }
                    image 
@@ -745,721 +745,169 @@
                        offset, 0 0;
                        to, "ButtonMouseArea";
                    }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset, 0 0;
-                       to, "ButtonMouseArea";
-                   }
-                   color, 255 255 255 255;
-               }
-           }
-           part
-           {
-               name, "ButtonPrevImage";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset,  3 3;
-                       to, "ButtonMouseArea";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 0.0;
-                       offset,  35 35;
-                       to, "ButtonMouseArea";
-                   }
-                   image
-                   {
-                       normal, "bt_prev_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset,  3 3;
-                       to, "ButtonMouseArea";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 0.0;
-                       offset,  35 35;
-                       to, "ButtonMouseArea";
-                   }
-                   image
-                   {
-                       normal, "bt_prev_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonNextImage";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonPrevImage";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonPrevImage";
-                   }
-                   image
-                   {
-                       normal, "bt_next_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonPrevImage";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonPrevImage";
-                   }
-                   image
-                   {
-                       normal, "bt_next_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonRotateRight";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonRotateLeft";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonRotateLeft";
-                   }
-                   image
-                   {
-                       normal, "bt_rotate_r_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonRotateLeft";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonRotateLeft";
-                   }
-                   image
-                   {
-                       normal, "bt_rotate_r_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonRotateLeft";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonNextImage";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonNextImage";
-                   }
-                   image
-                   {
-                       normal, "bt_rotate_l_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonNextImage";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonNextImage";
-                   }
-                   image
-                   {
-                       normal, "bt_rotate_l_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonSlideShowStart";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonZoomNormal";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonZoomNormal";
-                   }
-                   image
-                   {
-                       normal, "bt_slideshow_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 0;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonZoomNormal";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonZoomNormal";
-                   }
-                   image
-                   {
-                       normal, "bt_slideshow_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonSlideShowStop";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 0;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonZoomNormal";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonZoomNormal";
-                   }
-                   image
-                   {
-                       normal, "bt_slideshow_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonZoomNormal";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonZoomNormal";
-                   }
-                   image
-                   {
-                       normal, "bt_slideshow_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonZoomNormal";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonZoomIn";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonZoomIn";
-                   }
-                   image
-                   {
-                       normal, "bt_zoom_normal_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonZoomIn";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonZoomIn";
-                   }
-                   image
-                   {
-                       normal, "bt_zoom_normal_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonZoomIn";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonZoomOut";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonZoomOut";
-                   }
-                   image
-                   {
-                       normal, "bt_zoom_in_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonZoomOut";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonZoomOut";
-                   }
-                   image
-                   {
-                       normal, "bt_zoom_in_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonZoomOut";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonExpandImage";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonExpandImage";
-                   }
-                   image
-                   {
-                       normal, "bt_zoom_out_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonExpandImage";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonExpandImage";
-                   }
-                   image
-                   {
-                       normal, "bt_zoom_out_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonExpandImage";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonFullScreen";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonFullScreen";
-                   }
-                   image
-                   {
-                       normal, "bt_expand_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 0.0;
-                       offset, -35 0;
-                       to, "ButtonFullScreen";
-                   }
-                   rel2
-                   {
-                       relative, 0.0 1.0;
-                       offset,  -3 0;
-                       to, "ButtonFullScreen";
-                   }
-                   image
-                   {
-                       normal, "bt_expand_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonFullScreen";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 1.0;
-                       offset, 0 3;
-                       to, "ButtonExit";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  0 35;
-                       to, "ButtonExit";
-                   }
-                   image
-                   {
-                       normal, "bt_full_1.png";
-                   }
-               }
-               description
-               {
-                   state, "clicked" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 0.0 1.0;
-                       offset, 0 3;
-                       to, "ButtonExit";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  0 35;
-                       to, "ButtonExit";
-                   }
-                   image
-                   {
-                       normal, "bt_full_2.png";
-                   }
-               }
-           }
-           part
-           {
-               name, "ButtonSaveImage";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
-               description
-               {
-                   state, "default" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 1.0 0.0;
-                       offset, 0 0;
-                       to, "ButtonRotateRight";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  0 0;
-                       to, "ButtonRotateRight";
-                   }
-                   image
-                   {
-                       normal, "bt_save_1.png";
-                   }
-               }
-               description
-               {
-                   state, "visible" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonRotateRight";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonRotateRight";
-                   }
-                   image
-                   {
-                       normal, "bt_save_1.png";
-                   }
-               }
-               description
-               {
-                   state, "pulsing" 0.0;
-                   visible, 1;
-                   rel1
-                   {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonRotateRight";
-                   }
-                   rel2
-                   {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonRotateRight";
-                   }
-                   image
+                   rel2
                    {
-                       normal, "bt_save_1.png";
+                       relative, 1.0 1.0;
+                       offset, 0 0;
+                       to, "ButtonMouseArea";
                    }
-                   color, 255 255 255 32;
+                   color, 255 255 255 255;
                }
+           }
+           part
+           {
+               name, "ButtonStartMarker";
+               type, RECT;
+               mouse_events, 1;
                description
                {
-                   state, "clicked" 0.0;
+                   state, "default" 0.0;
                    visible, 1;
                    rel1
                    {
                        relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonRotateRight";
+                       offset, -20 7;
+                       to, "bg";
                    }
                    rel2
                    {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonRotateRight";
-                   }
-                   image
-                   {
-                       normal, "bt_save_2.png";
+                       relative, 1.0 0.0;
+                       offset, 0 7;
+                       to, "bg";
                    }
+                   color, 0 0 0 0;
                }
            }
+
+#define LEFT_OF_TOGGLE(pname, rel, im1, im2, def, click) \
+     part { name, pname; clip_to, "Buttons", type, IMAGE; mouse_events, 1; \
+     description { state, "default" 0.0; visible, def; \
+       rel1 { relative, 0.0 0.0; offset, -32 0; to, rel; } \
+       rel2 { relative, 0.0 0.0; offset, 0 32; to, rel; } \
+       image { normal, im1; } } \
+     description { state, "clicked" 0.0; visible, click; \
+       rel1 { relative, 0.0 0.0; offset, -32 0; to, rel; } \
+       rel2 { relative, 0.0 0.0; offset, 0 32; to, rel; } \
+       image { normal, im1; } } }
+#define LEFT_OF(pname, rel, im1, im2) \
+     part { name, pname; clip_to, "Buttons", type, IMAGE; mouse_events, 1; \
+     description { state, "default" 0.0; visible, 1; \
+       rel1 { relative, 0.0 0.0; offset, -32 0; to, rel; } \
+       rel2 { relative, 0.0 0.0; offset, 0 32; to, rel; } \
+       image { normal, im1; } } \
+     description { state, "clicked" 0.0; visible, 1; \
+       rel1 { relative, 0.0 0.0; offset, -32 0; to, rel; } \
+       rel2 { relative, 0.0 0.0; offset, 0 32; to, rel; } \
+       image { normal, im2; } } }
+#define SOUTH_OF(pname, rel, im1, im2) \
+     part { name, pname; clip_to, "Buttons", type, IMAGE; mouse_events, 1; \
+     description { state, "default" 0.0; visible, 1; \
+       rel1 { relative, 0.0 1.0; offset, 0 0; to, rel; } \
+       rel2 { relative, 0.0 1.0; offset, 32 32; to, rel; } \
+       image { normal, im1; } } \
+     description { state, "clicked" 0.0; visible, 1; \
+       rel1 { relative, 0.0 1.0; offset, 0 0; to, rel; } \
+       rel2 { relative, 0.0 1.0; offset, 32 32; to, rel; } \
+       image { normal, im2; } } }
+
+     /* First Row */
+     LEFT_OF("ButtonExit","ButtonStartMarker", "bt_close_1.png", "bt_close_2.png");
+     LEFT_OF("ButtonDeleteImage", "ButtonExit", "bt_delete_1.png",
+     "bt_delete_2.png");
+     LEFT_OF("ButtonRotateRight", "ButtonSaveImage", "bt_rotate_r_1.png",
+     "bt_rotate_r_2.png");
+     LEFT_OF("ButtonRotateLeft", "ButtonRotateRight", "bt_rotate_l_1.png",
+     "bt_rotate_l_2.png");
+     LEFT_OF("ButtonNextImage", "ButtonRotateLeft", "bt_next_1.png",
+     "bt_next_2.png");
+     LEFT_OF("ButtonPrevImage", "ButtonNextImage", "bt_prev_1.png",
+     "bt_prev_2.png");
+
+     /* Second Row */
+     SOUTH_OF("ButtonFullScreen", "ButtonExit", "bt_full_1.png",
+     "bt_full_2.png");
+     LEFT_OF("ButtonExpandImage", "ButtonFullScreen", "bt_expand_1.png",
+     "bt_expand_2.png");
+     LEFT_OF("ButtonZoomOut", "ButtonExpandImage", "bt_zoom_out_1.png",
+     "bt_zoom_out_2.png");
+     LEFT_OF("ButtonZoomIn", "ButtonZoomOut", "bt_zoom_in_1.png",
+     "bt_zoom_in_2.png");
+     LEFT_OF("ButtonZoomNormal", "ButtonZoomIn", "bt_zoom_normal_1.png",
+     "bt_zoom_normal_2.png");
+     LEFT_OF_TOGGLE("ButtonSlideShowStart", "ButtonZoomNormal",
+     "bt_slideshow_1.png", "bt_slideshow_1.png", 1, 0);
+     LEFT_OF_TOGGLE("ButtonSlideShowStop", "ButtonZoomNormal",
+     "bt_slideshow_2.png", "bt_slideshow_2.png", 0, 1);
+
            part
            {
-               name, "ButtonDeleteImage";
+               name, "ButtonSaveImage";
                type, IMAGE;
                mouse_events, 1;
                clip_to, "Buttons";
                description
                {
                    state, "default" 0.0;
-                   visible, 1;
+                   visible, 0;
                    rel1
                    {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonSaveImage";
+                       relative, 0.0 0.0;
+                       offset, 0 0;
+                       to, "ButtonDeleteImage";
                    }
                    rel2
                    {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonSaveImage";
+                       relative, 0.0 1.0;
+                       offset,  0 0;
+                       to, "ButtonDeleteImage";
                    }
                    image
                    {
-                       normal, "bt_delete_1.png";
+                       normal, "bt_save_1.png";
                    }
                }
                description
                {
-                   state, "clicked" 0.0;
+                   state, "visible" 0.0;
                    visible, 1;
                    rel1
                    {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
-                       to, "ButtonSaveImage";
+                       relative, 0.0 0.0;
+                       offset, -32 0;
+                       to, "ButtonDeleteImage";
                    }
                    rel2
                    {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
-                       to, "ButtonSaveImage";
+                       relative, 0.0 0.0;
+                       offset,  0 32;
+                       to, "ButtonDeleteImage";
                    }
                    image
                    {
-                       normal, "bt_delete_2.png";
+                       normal, "bt_save_1.png";
                    }
                }
-           }
-           part
-           {
-               name, "ButtonExit";
-               type, IMAGE;
-               mouse_events, 1;
-               clip_to, "Buttons";
                description
                {
-                   state, "default" 0.0;
+                   state, "pulsing" 0.0;
                    visible, 1;
                    rel1
                    {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
+                       relative, 0.0 0.0;
+                       offset, -32 0;
                        to, "ButtonDeleteImage";
                    }
                    rel2
                    {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
+                       relative, 0.0 0.0;
+                       offset,  0 32;
                        to, "ButtonDeleteImage";
                    }
                    image
                    {
-                       normal, "bt_close_1.png";
+                       normal, "bt_save_1.png";
                    }
+                   color, 255 255 255 32;
                }
                description
                {
@@ -1467,19 +915,19 @@
                    visible, 1;
                    rel1
                    {
-                       relative, 1.0 0.0;
-                       offset, 3 0;
+                       relative, 0.0 0.0;
+                       offset, -32 0;
                        to, "ButtonDeleteImage";
                    }
                    rel2
                    {
-                       relative, 1.0 1.0;
-                       offset,  35 0;
+                       relative, 0.0 0.0;
+                       offset,  0 32;
                        to, "ButtonDeleteImage";
                    }
                    image
                    {
-                       normal, "bt_close_2.png";
+                       normal, "bt_save_2.png";
                    }
                }
            }
@@ -2440,55 +1888,37 @@
                action, SIGNAL_EMIT "EnticeThumbsScrollNextStart" "";
            }
            /* Entice Signals We need to emit */
-           program
-           {
-               name, "NextImageRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonNextImage";
-               action, SIGNAL_EMIT "EnticeImageNext" "";
-           }
-           program
-           {
-               name, "PrevImageRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonPrevImage";
-               action, SIGNAL_EMIT "EnticeImagePrev" "";
-           }
-           program
-           {
-               name, "ZoomNormalRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonZoomNormal";
-               action, SIGNAL_EMIT "EnticeImageZoomDefault" "";
-           }
-           program
-           {
-               name,   "ZoomInRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonZoomIn";
-               action, SIGNAL_EMIT "EnticeImageZoomIn" "";
-           }
-           program
-           {
-               name,   "ZoomOutRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonZoomOut";
-               action, SIGNAL_EMIT "EnticeImageZoomOut" "";
-           }
-           program
-           {
-               name,   "ExpandRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonExpandImage";
-               action, SIGNAL_EMIT "EnticeImageZoomFit" "";
-           }
-           program
-           {
-               name,   "FullscreenRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonFullScreen";
-               action, SIGNAL_EMIT "EnticeFullScreen" "";
-           }
+#define BUTTON_PROG(pname, psig, pdname, puname, pcname) \
+           program { name, pdname; signal, "mouse,down,1"; source, \
+                   pname; action, STATE_SET "clicked" 0.0; \
+                   transition, LINEAR 0.0; target, pname; } \
+           program { name, puname; signal, "mouse,up,1"; source, \
+                   pname; action, STATE_SET "default" 0.0; \
+                   transition, DECELERATE 0.25; target, pname; } \
+           program { name, pcname; signal, "mouse,clicked,1"; source, \
+                   pname; action, SIGNAL_EMIT psig ""; } 
+           BUTTON_PROG("ButtonNextImage", "EnticeImageNext", "nidown",
+           "niup", "niclicked");
+           BUTTON_PROG("ButtonPrevImage", "EnticeImagePrev", "ipdown",
+           "ipup", "ipclicked");
+           BUTTON_PROG("ButtonZoomNormal", "EnticeImageZoomDefault", "zndown",
+           "znup", "znclicked");
+           BUTTON_PROG("ButtonZoomIn", "EnticeImageZoomIn", "zindown",
+           "zinup", "zinclicked");
+           BUTTON_PROG("ButtonZoomOut", "EnticeImageZoomOut", "zoutdown",
+           "zoutup", "zoutclicked");
+           BUTTON_PROG("ButtonExpandImage", "EnticeImageZoomFit", "zfitdown",
+           "zfitup", "zfitclicked");
+           BUTTON_PROG("ButtonFullScreen", "EnticeFullScreen", "zfsdown",
+           "zfsup", "zfsclicked");
+           BUTTON_PROG("ButtonSaveImage", "EnticeSaveImage", "sidown",
+           "siup", "siclicked");
+           BUTTON_PROG("ButtonRotateRight", "EnticeImageRotateRight", "rrdown",
+           "rrup", "rrclicked");
+           BUTTON_PROG("ButtonRotateLeft", "EnticeImageRotateLeft", "rldown",
+           "rlup", "rlclicked");
+           BUTTON_PROG("ButtonExit", "EnticeQuit", "qbdown",
+           "qbcup", "qbclicked");
            program
            {
                name, "DeleteImageRequest";
@@ -2534,34 +1964,6 @@
            }
            program
            {
-               name, "SaveImageRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonSaveImage";
-               action, SIGNAL_EMIT "EnticeImageSave" "";
-           }
-           program
-           {
-               name, "RotateRightImageRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonRotateRight";
-               action, SIGNAL_EMIT "EnticeImageRotateRight" "";
-           }
-           program
-           {
-               name, "RotateLeftImageRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonRotateLeft";
-               action, SIGNAL_EMIT "EnticeImageRotateLeft" "";
-           }
-           program
-           {
-               name,   "ExitRequest";
-               signal, "mouse,clicked,1";
-               source, "ButtonExit";
-               action, SIGNAL_EMIT "EnticeQuit" "";
-           }
-           program
-           {
                name,   "SlideShowRequest";
                signal, "mouse,clicked,1";
                source, "ButtonSlideShowStart";
@@ -2770,193 +2172,14 @@
            /* just for looks */
            program
            {
-               name, "ButtonClicked";
-               signal, "mouse,down,1";
-               source, "ButtonDeleteImage";
-               action, STATE_SET "clicked" 0.0;
-               transition, LINEAR 0.0;
-               target, "ButtonDeleteImage";
-           }
-           program
-           {
-               name, "ButtonUnClicked";
-               signal, "mouse,up,1";
-               source, "ButtonDeleteImage";
-               action, STATE_SET "visible" 0.0;
-               transition, DECELERATE 0.25;
-               target, "ButtonDeleteImage";
-           }
-           program
-           {
-               name, "ButtonClicked";
-               signal, "mouse,down,1";
-               source, "ButtonSaveImage";
-               action, STATE_SET "clicked" 0.0;
-               transition, LINEAR 0.0;
-               target, "ButtonSaveImage";
-           }
-           program
-           {
                name, "ButtonUnClicked";
-               signal, "mouse,up,1";
+               signal, "mouse,clicked,1";
                source, "ButtonSaveImage";
                action, STATE_SET "default" 0.0;
                transition, DECELERATE 0.25;
                target, "ButtonSaveImage";
                target, "ButtonMouseArea";
                after, "KillSaveImagePulsing";
-           }
-           program
-           {
-               name, "ZoomInButtonClicked";
-               signal, "mouse,clicked,1";
-               source, "ButtonZoomIn";
-               action, STATE_SET "clicked" 0.0;
-               transition, LINEAR 0.0;
-               target, "ButtonZoomIn";
-               after, "ZoomInButtonUnClicked";
-           }
-           program
-           {
-               name, "ZoomInButtonUnClicked";
-               signal, "";
-               source, "ButtonZoomIn";
-               action, STATE_SET "default" 0.0;
-               transition, DECELERATE 0.25;
-               target, "ButtonZoomIn";
-           }
-           program
-           {
-               name, "ZoomOutButtonClicked";
-               signal, "mouse,clicked,1";
-               source, "ButtonZoomOut";
-               action, STATE_SET "clicked" 0.0;
-               transition, LINEAR 0.0;
-               target, "ButtonZoomOut";
-               after, "ZoomOutButtonUnClicked";
-           }
-           program
-           {
-               name, "ZoomOutButtonUnClicked";
-               signal, "";
-               source, "ButtonZoomOut";
-               action, STATE_SET "default" 0.0;
-               transition, DECELERATE 0.25;
-               target, "ButtonZoomOut";
-           }
-           program
-           {
-               name, "ZoomNormalButtonClicked";
-               signal, "mouse,clicked,1";
-               source, "ButtonZoomNormal";
-               action, STATE_SET "clicked" 0.0;
-               transition, LINEAR 0.0;
-               target, "ButtonZoomNormal";
-               after, "ZoomNormalButtonUnClicked";
-           }
-           program
-           {
-               name, "ZoomNormalButtonUnClicked";
-               signal, "";
-               source, "ButtonZoomNormal";
-               action, STATE_SET "default" 0.0;
-               transition, DECELERATE 0.25;
-               target, "ButtonZoomNormal";
-           }
-           program
-           {
-               name, "NextImageButtonClicked";
-               signal, "mouse,clicked,1";
-               source, "ButtonNextImage";
-               action, STATE_SET "clicked" 0.0;
-               transition, LINEAR 0.0;
-               target, "ButtonNextImage";
-               after, "NextImageButtonUnClicked";
-           }
-           program
-           {
-               name, "NextImageButtonUnClicked";
-               signal, "";
-               source, "ButtonNextImage";
-               action, STATE_SET "default" 0.0;
-               transition, DECELERATE 0.25;
-               target, "ButtonNextImage";
-           }
-           program
-           {
-               name, "PrevImageButtonClicked";
-               signal, "mouse,clicked,1";
-               source, "ButtonPrevImage";
-               action, STATE_SET "clicked" 0.0;
-               transition, LINEAR 0.0;
-               target, "ButtonPrevImage";
-               after, "PrevImageButtonUnClicked";
-           }
-           program
-           {
-               name, "PrevImageButtonUnClicked";
-               signal, "";
-               source, "ButtonPrevImage";
-               action, STATE_SET "default" 0.0;
-               transition, DECELERATE 0.25;
-               target, "ButtonPrevImage";
-           }
-           program
-           {
-               name, "ExpandImageButtonClicked";
-               signal, "mouse,clicked,1";
-               source, "ButtonExpandImage";
-               action, STATE_SET "clicked" 0.0;
-               transition, LINEAR 0.0;
-               target, "ButtonExpandImage";
-               after, "ExpandImageButtonUnClicked";
-           }
-           program
-           {
-               name, "ExpandImageButtonUnClicked";
-               signal, "";
-               source, "ButtonExpandImage";
-               action, STATE_SET "default" 0.0;
-               transition, DECELERATE 0.25;
-               target, "ButtonExpandImage";
-           }
-           program
-           {
-               name, "RotateImageRightButtonClicked";
-               signal, "mouse,clicked,1";
-               source, "ButtonRotateRight";
-               action, STATE_SET "clicked" 0.0;
-               transition, LINEAR 0.0;
-               target, "ButtonRotateRight";
-               after, "RotateImageRightButtonUnClicked";
-           }
-           program
-           {
-               name, "RotateImageRightButtonUnClicked";
-               signal, "";
-               source, "ButtonRotateRight";
-               action, STATE_SET "default" 0.0;
-               transition, DECELERATE 0.25;
-               target, "ButtonRotateRight";
-           }
-           program
-           {
-               name, "RotateImageLeftButtonClicked";
-               signal, "mouse,clicked,1";
-               source, "ButtonRotateLeft";
-               action, STATE_SET "clicked" 0.0;
-               transition, LINEAR 0.0;
-               target, "ButtonRotateLeft";
-               after, "RotateImageLeftButtonUnClicked";
-           }
-           program
-           {
-               name, "RotateImageLeftButtonUnClicked";
-               signal, "";
-               source, "ButtonRotateLeft";
-               action, STATE_SET "default" 0.0;
-               transition, DECELERATE 0.25;
-               target, "ButtonRotateLeft";
            }
            program
            {




-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to