Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/data/images


Modified Files:
        bg.edc 


Log Message:
Resolve program name conflict.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/images/bg.edc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- bg.edc      29 Jul 2004 20:14:00 -0000      1.13
+++ bg.edc      8 Oct 2004 15:59:28 -0000       1.14
@@ -2,10 +2,10 @@
 #define CATSTR(x, y) STR(x## y)
 #define CATPNG(x, y) STR(x##y.png)
 #define TOUR_IMAGE(PNAME) \
-       image, CATPNG(PNAME,) LOSSY 98; \
-       image, CATPNG(PNAME,1) LOSSY 98; \
-       image, CATPNG(PNAME,2) LOSSY 98; \
-       image, CATPNG(PNAME,3) LOSSY 98;
+       image, CATPNG(PNAME,) LOSSY 80; \
+       image, CATPNG(PNAME,1) LOSSY 80; \
+       image, CATPNG(PNAME,2) LOSSY 80; \
+       image, CATPNG(PNAME,3) LOSSY 80;
 #define TOUR_PART(PNAME, ASPECT) \
 description { \
        state, #PNAME 0.0; \
@@ -61,6 +61,7 @@
        } \
        program { \
                name, CATSTR(PNEXT,_trigger); \
+               action, SIGNAL_EMIT "start_fade" "fader"; \
                action, SIGNAL_EMIT STR(PNEXT) "tour"; \
        }
 
@@ -181,10 +182,43 @@
                }
 
                parts {
+                       part {
+                               name, "fade";
+                               mouse_events, 0;
+                               type, RECT;
+
+                               description {
+                                       color, 255 255 255 255;
+                                       state, "default" 0.0;
+                                       rel1 {
+                                               relative, 0.0 0.0;
+                                               offset, 0 0;
+                                       }
+                                       rel2 {
+                                               relative, 1.0 1.0;
+                                               offset, -1 -1;
+                                       }
+                               }
+
+                               description {
+                                       color, 255 255 255 90;
+                                       state, "fade" 0.0;
+                                       rel1 {
+                                               relative, 0.0 0.0;
+                                               offset, 0 0;
+                                       }
+                                       rel2 {
+                                               relative, 0.0 0.0;
+                                               offset, 0 0;
+                                       }
+                               }
+
+                       }
 
                        part {
                                name, "display";
                                mouse_events, 1;
+                               clip_to, "fade";
 
                                description {
                                        state, "default" 0.0;
@@ -232,12 +266,30 @@
                programs {
 
                        program {
-                               name,       "_trigger";
-                               signal,     "start_tour";
+                               name,       "fader";
+                               signal,     "start_fade";
                                source,     "*";
-                               action,     SIGNAL_EMIT "elicit" "tour";
+                               action,     STATE_SET "fade" 0.0;
+                               transition, LINEAR 1.0;
+                               target,     "fade";
+                               after,      "defader";
                        }
 
+                       program {
+                               name,       "defader";
+                               action,     STATE_SET "default" 0.0;
+                               transition, LINEAR 1.0;
+                               target,     "fade";
+                       }
+
+                       // program {
+                       //      name,       "_trigger";
+                       //      signal,     "start_tour";
+                       //      signal,     "mouse,down,1";
+                       //      source,     "*";
+                       //      action,     SIGNAL_EMIT "elicit" "tour";
+                       // }
+
                        TOUR_PROG(elicit, entrance, display);
                        TOUR_PROG(entrance, entice, display);
                        TOUR_PROG(entice, evidence, display);




-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to