Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default


Modified Files:
        add_dir_box.edc button.edc button_progs.edc default.edc 
        menu_item.edc 
Added Files:
        main.edc 


Log Message:
- patch from Mathieu Lamar to:
   - add a scrollbar to the menu in entangle.
   - split the theme into multiple files

===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/add_dir_box.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- add_dir_box.edc     29 Apr 2005 01:55:49 -0000      1.1
+++ add_dir_box.edc     26 May 2005 00:34:19 -0000      1.2
@@ -1,295 +1,36 @@
-
 group {
     name, "add_dir";
     parts {
-#if 0
-        part {
-            name, "dir_bg";
-            type, RECT;
-            description {
-                state, "default" 0.0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                }
-                color, 255 255 255 255;
-            }
-        }
-
-        part {
-            name, "entry";
-            type, TEXT;
-            effect, NONE;
-            description {
-                state, "default" 0.0;
-                align, 0.0 0.5;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 4 1;
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                }
-                color, 0 0 0 255;
-                text {
-                    text, "text";
-                    font, "Vera";
-                    size, 10;
-                    min, 1 0;
-                    align, 0.0 0.5;
-                }
-            }
-        }
-#endif
-        part {
-            name, "menu_base";
-            mouse_events, 0;
-            description {
-                state, "default" 0.0;
-                align, 0.5 0.0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                }
-                image {
-                    normal, "e17_menu_bg.png";
-                }
-                fill {
-                    smooth: 0;
-                }
-            }
-        }
-        part {
-            name, "base3";
-            mouse_events, 0;
-            description {
-                state, "default" 0.0;
-                rel1 {
-                    relative, 1.0 0.0;
-                    offset, 4 0;
-                    to, "menu_base";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -4 -1;
-                    to, "menu_base";
-                }
-                image {
-                    normal, "e17_menu_bg_border.png";
-                    border, 1 1 1 1;
-                    middle, 0;
-                }
-                fill {
-                    smooth, 0;
-                }
-            }
-        }
-        part {   
-            name, "title_outline";
-            mouse_events, 0; 
-            description {
-                state, "default" 0.0;
-                min, 14 14;
-                visible, 1;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                }  
-                image {
-                    normal, "e17_titlebar_outline.png";
-                    border, 8 8 8 8;
-                    middle, 0;
-                }  
-                fill {
-                    smooth, 0;
-                }  
-                color, 255 255 255 255;
-            }
-            description {
-                state, "active" 0.0;
-                min, 14 14;
-                visible, 0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                }
-                image {
-                    normal, "e17_titlebar_outline.png";
-                    border, 8 8 8 8;
-                    middle, 0;
-                }
-                fill {
-                    smooth, 0;
-                }
-                color, 255 255 255 0;
-            }
-        }
         part {
-            name, "title_shadow2";
+            name, "entry_bg";
             mouse_events, 0;
             description {
                 state, "default" 0.0;
-                visible, 0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }
-                image {
-                    normal, "e17_titlebar_shadow2.png";
-                    border, 8 8 8 8;
-                }
-                fill {
-                    smooth, 0;
-                }
-                color, 255 255 255 0;
-            }
-            description {
-                state, "active" 0.0;
-                visible, 1;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }
-                image {
-                    normal, "e17_titlebar_shadow2.png";
-                    border, 8 8 8 8;
-                }
-                fill {
-                    smooth, 0;
-                }
-                color, 255 255 255 255;
-            }
-        }     
-        part {
-            name, "title_shadow1";
-            mouse_events, 0;
-            description {   
-                state, "default" 0.0;
-                visible, 0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }
-                image {
-                    normal, "e17_titlebar_shadow1.png";
-                    border, 8 8 8 8;
-                }
-                fill {
-                    smooth, 0;
-                }
-                color, 255 255 255 0;
-            }     
-            description {   
-                state, "active" 0.0;
-                visible, 1;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }
+                rel1.to, "entry";
+                rel1.offset, -15 0;
+                rel2.to, "entry";
+                rel2.offset, 15 -5;
+
                 image {
-                    normal, "e17_titlebar_shadow1.png";
-                    border, 8 8 8 8;
-                }
-                fill {
-                    smooth, 0;
+                    normal, "e17_ibar_bg_h.png";
+                    border, 6 6 6 6;
                 }
-                color, 255 255 255 255;
             }
         }
-        part {
-            name, "title_bar";
-            mouse_events, 0;
-            description {
-                state, "default" 0.0;
-                visible, 0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }
-                image {
-                    normal, "e17_titlebar.png";
-                    border, 8 8 8 8;
-                }
-                color, 255 255 255 0;
-            }  
-            description {
-                state, "active" 0.0;
-                visible, 1; 
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }  
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }  
-                image {
-                    normal, "e17_titlebar.png";
-                    border, 8 8 8 8;
-                }  
-                color, 255 255 255 255;
-            }  
-        }  
+        ITEM_OVERLAY("entry_bg", "h");
+
         part {
             name, "entry";
             type, TEXT;
             effect, SHADOW;
             mouse_events, 0;
+
             description {
                 state, "default" 0.0;
+                min: 100 30;
                 rel1 {
                     relative, 0.0 0.0;
-                    offset, 8 6; 
-                    to, "title_outline";
+                    offset, 8 6;
                 }  
                 rel2 {
                     relative, 1.0 1.0;
@@ -309,4 +50,3 @@
     }
 }
 
-
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/button.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- button.edc  16 May 2005 00:27:32 -0000      1.2
+++ button.edc  26 May 2005 00:34:20 -0000      1.3
@@ -1,222 +1,11 @@
-part {
-    name:          "button";
-    mouse_events,  0;
-
-    description {
-       state,    "default" 0.0;
-       rel1.to, "text";
-       rel2.to, "text";
-       rel1 {
-           relative, 0.0 0.0;
-           offset, -8 -2;
-       }
-       
-       rel2 {
-           relative, 1.0 1.0;
-           offset, 6 -1;
-       }
-       
-       image {
-           normal, "e17_button.png";
-           border, 8 8 8 8;
-       }
-    }
-    description {
-       state,    "clicked" 0.0;
-       inherit,  "default" 0.0;
-       image {
-           normal, "e17_button2.png";
-       }
-    }
-}
-part {
-    name, "text";
-    type, TEXT;
-    effect, SHADOW;
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 8 2;
-        }  
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -6 -2;
-        }  
-        color, 0 0 0 255;
-        color3, 255 255 255 128;
-        text {
-            text, "Item Label";
-            font, "Vera";
-            size, 10;
-            min, 1 1;
-            align, 0.5 0.5;
-        }
-    }
-}
-part {
-    name, "title_glint_clip";
-    type, RECT;
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        rel1 {
-            offset, 3 3;
-            to, "button";
-        }
-        rel2 {
-            offset, -4 -4;
-            to, "button";
-        }
-        color, 255 255 255 255;
-    }
-}
-part {
-    name, "title_glint_1";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        align, 0.0 0.0;
-        max, 34 13;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 2 2;
-            to, "button";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -3 -3;
-            to, "button";
-        }
-        image {
-            normal, "e17_titlebar_glint1.png"; 
-            border, 5 0 5 0;
-        }  
-        fill {
-            smooth, 0;
-        }
-    } 
-    description {   
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-    }  
-}        
-part {   
-    name, "title_glint_2";
-    mouse_events, 0;
-    clip_to, "title_glint_clip";
-    description {   
-        state, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        align, 1.0 0.5;
-        max, 0 0;
-        rel1 {      
-            relative, 0.0 0.0;
-            offset, 3 3;
-            to, "button";
+    group {
+        name, "button";
+        parts {
+#include "parts/button_parts.edc"
         }
-        rel2 {    
-            relative, 0.0 1.0;
-            offset, 3 -4;
-            to, "button";
-        }  
-        image {
-            normal, "e17_titlebar_glint2.png";
-            border, 0 0 5 5;
-        }
-        fill {
-            smooth, 0;
-        }  
-    }  
-    description {
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.5 0.5;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 3 3;
-        }
-        rel2 {
-            relative, 0.0 1.0;
-            offset, 3 -4;
-        }
-    }
-    description {
-        state, "active2" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 128;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.5 0.5;
-        rel1 {
-            relative, 1.0 0.0;
-            offset, -4 3;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -4 -4;
+
+        programs {
+#include "programs/button_progs.edc"
         }
     }
-    description {
-        state, "active3" 0.0;
-        inherit, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.0 0.5;
-        rel1 {
-            relative, 1.0 0.0;
-            offset, -4 3;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -4 -4;
-        }
-    }  
-}     
-part {   
-    name, "title_glint_3";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0; 
-        color, 255 255 255 0;
-        align, 1.0 1.0;
-        max, 34 13;
-        rel1 {    
-            relative, 0.0 0.0;
-            offset, 2 2;
-            to, "button";
-        }
-        rel2 {    
-            relative, 1.0 1.0;
-            offset, -3 -3;
-            to, "button";
-        }  
-        image {
-            normal, "e17_titlebar_glint3.png";
-            border, 0 5 0 5;
-        }  
-        fill {
-            smooth, 0;
-        }
-    }  
-    description {
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-    }  
-}
+
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/button_progs.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- button_progs.edc    16 May 2005 00:27:33 -0000      1.2
+++ button_progs.edc    26 May 2005 00:34:20 -0000      1.3
@@ -43,10 +43,9 @@
      target, "title_glint_1";
      target, "title_glint_2";
      target, "title_glint_3";
- }
+}
 
-program 
-{
+program {
     name, "button_down";
     signal, "mouse,down,1";
     source, "overlay";
@@ -54,9 +53,7 @@
     target, "button";
     
 }
-
-program 
-{
+program {
     name, "button_up";
     signal, "mouse,up,1";
     source, "overlay";
@@ -64,3 +61,4 @@
     target, "button";
     
 }
+
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/default.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- default.edc 16 May 2005 00:27:33 -0000      1.2
+++ default.edc 26 May 2005 00:34:20 -0000      1.3
@@ -1,770 +1,18 @@
-
-images {
-    image, "e.png" COMP;
-    image, "logo.png" COMP;
-    image, "bg.png" COMP;
-    image, "text_sel.png" COMP;
-    image, "panel.png" COMP;
-    image, "up.png" COMP;
-    image, "down.png" COMP;
-    image, "e17_menu_bg.png" COMP;
-    image, "e17_menu_arrow.png" COMP;
-    image, "e17_menu_bg_border.png" COMP;
-    image, "e17_titlebar.png" COMP;
-    image, "e17_titlebar_glint1.png" COMP;
-    image, "e17_titlebar_glint2.png" COMP;
-    image, "e17_titlebar_glint3.png" COMP;
-    image, "e17_titlebar_outline.png" COMP;
-    image, "e17_titlebar_shadow1.png" COMP;
-    image, "e17_titlebar_shadow2.png" COMP;
-    image: "e17_button.png" LOSSY 90;
-    image: "e17_button2.png" LOSSY 90;
-    image: "e17_ibar_bg_h.png" LOSSY 90;
-    image: "e17_ibar_over_h.png" LOSSY 90;
-    image: "e17_ibar_bg_v.png" LOSSY 90;
-    image: "e17_ibar_over_v.png" LOSSY 90;
-}
+#include "images/images.edc"
 
 fonts {
     font, "Vera.ttf" "Vera";
     font, "VeraBd.ttf" "VeraBd";
 }
 
-collections {
-    group {
-        name, "Main";
-
-        parts {
-            /* generic bg stuff */
-            part {
-                name, "bg";
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 0;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                    }
-                    image {
-                        normal, "bg.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, -1 -1;
-                        }
-                    }
-                }
-            }
-            part {
-                name, "e_logo";
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, -30 -40;
-                    }
-                    rel2 {
-                        relative, 0.0 0.0;
-                        offset, 90 120;
-                    }
-                    image {
-                        normal, "logo.png";
-                    }
-                    color, 255 255 255 64;
-                }
-            }
-            part {
-                name, "e";
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, -9 2;
-                        to, "title";
-                    }
-                    rel2 {
-                        relative, 0.0 0.0;
-                        offset, 3 17;
-                        to, "title";
-                    }
-                    image {
-                        normal, "e.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-            }
-            part {
-                name, "title";
-                type, TEXT;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 1.0 1.0;
-                        offset, -80 -24;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -5 -2;
-                    }
-                    text {
-                        text, "NTANGLE";
-                        font, "VeraBd";
-                        size, 12;
-                    }
-                    color, 0 0 0 255;
-                }
-            }
-
-            /* the eapps bar */
-            part {
-                name, "eapps_bar_body";
-                description {
-                    state, "default" 0.0;
-                   color, 255 255 255 220;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 28 0;
-                    }
-                    rel2 {
-                        relative, 0.0 1.0;
-                        offset, 80 -80;
-                    }
-                    image {
-                       normal, "e17_ibar_bg_v.png";
-                        border, 13 13 13 13;
-                    }
-               }
-           }
-           part {
-               name: "eapps_bar_body_overlay";
-               mouse_events:  0;
-               description {
-                   state:    "default" 0.0;
-                   color, 255 255 255 255;
-                   rel1.to, "eapps_bar_body";
-                   rel2.to, "eapps_bar_body";
-                   
-                   image {
-                       normal: "e17_ibar_over_v.png";
-                       border: 13 13 13 13;
-                   }
-               }
-           }
-            part {
-                name, "eapps_bar";
-                type, SWALLOW;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        to, "eapps_bar_body";
-                        offset, 0 28;
-                    }
-                    rel2 {
-                        to, "eapps_bar_body";
-                        offset, 0 -28;
-                    }
-                }
-            }
-            part {
-                name, "up_arrow";
-                mouse_events, 1;
-                repeat_events, 0;
-                description {
-                    state, "default" 0.0;
-                    min, 29 21;
-                    max, 29 21;
-                   color, 255 255 255 180;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 6;
-                        to, "eapps_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 0.0;
-                        offset, 0 27;
-                        to, "eapps_bar_body";
-                    }
-                    image {
-                        normal, "up.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-                description {
-                    state, "glow" 0.0;
-                    inherit, "default" 0.0;
-                    color, 246 207 135 255;
-                }
-                description {
-                    state, "hidden" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 0;
-                }
-            }
-            part {
-                name, "down_arrow";
-                mouse_events, 1;
-                repeat_events, 0;
-                description {
-                    state, "default" 0.0;
-                    min, 29 21;
-                    max, 29 21;
-                   color, 255 255 255 180;
-                    rel1 {
-                        relative, 0.0 1.0;
-                        offset, 0 -6;
-                        to, "eapps_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, 0 -27;
-                        to, "eapps_bar_body";
-                    }
-                    image {
-                        normal, "down.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-                description {
-                    state, "glow" 0.0;
-                    inherit, "default" 0.0;
-                    color, 246 207 135 255;
-                }
-                description {
-                    state, "hidden" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 0;
-                }
-            }
-
-            /* eapp info box */
-            part {
-                name, "eapp_info";
-                description {
-                    state, "default" 0.0;
-                    visible, 0;
-                    rel1 {
-                        relative, 0.0 1.0;
-                        offset, 28 -79;
-                    }
-                    rel2 {
-                        relative, 0.0 1.0;
-                        offset, 200 -40;
-                    }
-                   image {
-                       normal, "e17_ibar_bg_v.png";
-                        border, 13 13 13 13;
-                    }
-                }
-                description {
-                    state, "show" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 1;
-                }
-            }
-           part {
-               name:          "eapp_info_overlay";
-               mouse_events:  0;
-               description {
-                   state:    "default" 0.0;
-                   visible, 0;
-                   rel1.to, "eapp_info";
-                   rel2.to, "eapp_info";
-                   
-                   image {
-                       normal: "e17_ibar_over_v.png";
-                       border: 13 13 13 13;
-                   }
-               }
-               description {
-                    state, "show" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 1;
-                }
-           }
-            part {
-                name, "eapp_info_name";
-                type, TEXT;
-                description {
-                    state, "default" 0.0;
-                    visible, 0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 2 14;
-                        to, "eapp_info";
-                    }
-                    rel2 {
-                        relative, 1.0 0.0;
-                        offset, 2 14;
-                        to, "eapp_info";
-                    }
-                    text {
-                        text, "name";
-                        font, "VeraBd";
-                        size, 10;
-                    }
-                    color, 0 0 0 255;
-                }
-                description {
-                    state, "show" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 1;
-                }
-            }
-            part {
-                name, "eapp_info_class";
-                type, TEXT;
-                description {
-                    state, "default" 0.0;
-                    visible, 0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 2 20;
-                        to, "eapp_info";
-                    }
-                    rel2 {
-                        relative, 1.0 0.0;
-                        offset, 2 32;
-                        to, "eapp_info";
-                    }
-                    text {
-                        text, "class";
-                        font, "VeraBd";
-                        size, 10;
-                    }
-                    color, 0 0 0 255;
-                }
-                description {
-                    state, "show" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 1;
-                }
-            }
-
-            /* the button bar */
-            part {
-                name, "button_bar_body";
-                type, RECT;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 1.0 0.0;
-                        offset, 0 0;
-                        to, "eapps_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 0.0;
-                        offset, 0 0;
-                        to, "menu_base";
-                    }
-                    color, 0 0 0 0;
-                }
-            }
-            part {
-                name, "button_bar";
-                type, RECT;
-                description {
-                    state, "default" 0.0;
-                   color, 0 0 0 0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 5 0;
-                        to, "button_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                        to, "button_bar_body";
-                    }
-                }
-            }
-
-            /* the menu */
-            part {
-                name, "base";
-                mouse_events, 0;
-                type, RECT;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 4 4;
-                        to, "menu_base";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -4 -4;
-                        to, "menu_base";
-                    }
-                    color, 221 221 221 0;
-                }
-            }
-            part {
-                name, "menu_base";
-                mouse_events, 0;
-                description {
-                    state, "default" 0.0;
-                    align, 0.5 0.0;
-                    rel1 {
-                        relative, 1.0 0.0;
-                        offset, 5 36;
-                        to, "eapps_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -5 -2;
-                        to_y, "eapps_bar_body";
-                    }
-                    image {
-                        normal, "e17_ibar_bg_h.png";
-                       border, 6 6 6 6;
-                    }
-                }
-            }
-           part {
-               name:          "menu_base_overlay";
-               mouse_events:  0;
-               description {
-                   state:    "default" 0.0;
-                   color, 255 255 255 255;
-                   rel1.to, "menu_base";
-                   rel2.to, "menu_base";
-                   
-                   image {
-                       normal: "e17_ibar_over_h.png";
-                       border: 13 13 13 13;
-                   }
-               }
-           }
-           
-            part {
-                name, "base3";
-                mouse_events, 0;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 1.0 0.0;
-                        offset, 4 0;
-                        to, "menu_base";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -4 -1;
-                        to, "menu_base";
-                    }
-                    image {
-                        normal, "e17_menu_bg_border.png";
-                        border, 1 1 1 1;
-                        middle, 0;
-                    }
-                    fill {
-                        smooth, 0;
-                    }
-                }
-            }
-            part {
-                name, "menu_items";
-                mouse_events, 0;
-                type, RECT;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 13 13;
-                        to, "menu_base";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -13 -13;
-                        to, "menu_base";
-                    }
-                    color, 0 0 0 0;
-                }
-            }
-
-            /* cmd buttons */
-            part {
-                name, "cmd_bar";
-                type, SWALLOW;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 1.0 1.0;
-                        offset, 125 0;
-                        to, "eapps_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 0.0;
-                        offset, -1 -1;
-                        to, "title";
-                    }
-                    color, 0 0 0 0;
-                }
-            }
-        }
+#include "macros/macros.inc"
 
-        programs {
-            program {   
-                name, "up_click";
-                source, "up_arrow";
-                signal, "mouse,down,*";
-                action, SIGNAL_EMIT "up,clicked" "*";
-            }               
-            program {   
-                name, "up_click_release";
-                source, "up_arrow"; 
-                signal, "mouse,up,*"; 
-                action, SIGNAL_EMIT "up,click,release" "*";
-            }       
-            program {
-                name, "down_click";
-                source, "down_arrow";
-                signal, "mouse,down,*";
-                action, SIGNAL_EMIT "down,clicked" "*";
-            }
-            program {
-                name, "down_click_release";
-                source, "down_arrow";
-                signal, "mouse,up,*";
-                action, SIGNAL_EMIT "down,click,release" "*";
-            }
-            program {
-                name, "hide";
-                source, "*";
-                signal, "arrows,hide";
-                action, STATE_SET "hidden" 0.0;
-                target, "up_arrow";
-                target, "down_arrow";
-            }
-            program {
-                name, "show";
-                source, "*";
-                signal, "arrows,show";
-                action, STATE_SET "default" 0.0;
-                target, "up_arrow";
-                target, "down_arrow";
-            }
-            program {
-                name, "up_glow";
-                source, "up_arrow";
-                signal, "mouse,in";
-                action, STATE_SET "glow" 0.0;
-                target, "up_arrow";
-            }
-            program {
-                name, "up_unglow";
-                source, "up_arrow";
-                signal, "mouse,out";
-                action, STATE_SET "default" 0.0;
-                target, "up_arrow";
-            }
-            program {
-                name, "down_glow";
-                source, "down_arrow";
-                signal, "mouse,in";
-                action, STATE_SET "glow" 0.0;
-                target, "down_arrow";
-            }
-            program {
-                name, "down_unglow";
-                source, "down_arrow";
-                signal, "mouse,out";
-                action, STATE_SET "default" 0.0;
-                target, "down_arrow";
-            }
-            program {
-                name, "eapp,info,hide";
-                source, "*";
-                signal, "eapp,info,hide";
-                action, STATE_SET "default" 0.0;
-                target, "eapp_info";
-               target, "eapp_info_overlay";
-                target, "eapp_info_name";
-                target, "eapp_info_class";
-                transition, LINEAR 0.25;
-            }
-            program {
-                name, "eapp,info,show";
-                source, "*";
-                signal, "eapp,info,show";
-                action, STATE_SET "show" 0.0;
-                target, "eapp_info";
-               target, "eapp_info_overlay";
-                target, "eapp_info_name";
-                target, "eapp_info_class";
-                transition, LINEAR 0.25;
-            }
-        }
-    }
-
-    group {
-        name, "menu_item";
-        parts {
-            part {
-                name, "icon";
-                type, SWALLOW;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 0;
-                    }
-                    rel2 {
-                        relative, 0.0 1.0;
-                        offset, 28 -1;
-                    }
-                }
-            }
+collections {
 
+#include "main.edc"
 #include "menu_item.edc"
-
-            part {
-                name, "arrow";
-                mouse_events, 0;
-                description {
-                    state, "default" 0.0;
-                    visible, 0;
-                    min, 6 12;
-                    max, 6 12;
-                    rel1 {
-                        relative, 1.0 0.0;
-                        offset, -12 0;
-                        to, text;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                        to, text;
-                    }
-                    image {
-                        normal, "e17_menu_arrow.png";
-                    }
-                }
-                description {
-                    state, "show" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 1;
-                }
-            }
-            part {
-                name, "overlay";
-                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, -1 -1;
-                    }
-                    color, 0 0 0 0;
-                }
-            }
-        }
-
-        programs {
-            program {
-                name, "arrow,show";
-                source, "*";
-                signal, "arrow,show";
-                action, STATE_SET "show" 0.0;
-                target, "arrow";
-            }
-            program {
-                name, "dir,clicked";
-                source, "*";
-                signal, "mouse,up,1";
-                action, SIGNAL_EMIT "dir,clicked" "*";
-            }
-            program {
-                name, "del,clicked";
-                source, "*";
-                signal, "mouse,up,2";
-                action, SIGNAL_EMIT "del,clicked" "*";
-            }
-            program {
-                name, "move,down";
-                source, "*";
-                signal, "mouse,down,3";
-                action, SIGNAL_EMIT "move,start" "*";
-            }
-#include "menu_item_progs.edc"
-        }
-    }
-
-    group {
-        name, "button";
-        parts {
-#include "button.edc"
-            part {
-                name, "overlay";
-                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, -1 -1;
-                    }
-                    color, 0 0 0 0;
-                }
-            }
-        }
-
-        programs {
-#include "button_progs.edc"
-            program {
-                name, "button,clicked";
-                source, "*";
-                signal, "mouse,up,1";
-                action, SIGNAL_EMIT "button,clicked" "*";
-            }
-        }
-    }
-
 #include "add_dir_box.edc"
+#include "button.edc"    
+
 }
 
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/menu_item.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- menu_item.edc       16 May 2005 00:27:33 -0000      1.1
+++ menu_item.edc       26 May 2005 00:34:20 -0000      1.2
@@ -1,379 +1,9 @@
-part {   
-    name, "title_outline";
-    mouse_events, 0; 
-    description {
-        state, "default" 0.0;
-        min, 14 14;
-        visible, 1;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 30 -1;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-        }  
-        image {
-            normal, "e17_titlebar_outline.png";
-            border, 8 8 8 8;
-            middle, 0;
-        }  
-        fill {
-            smooth, 0;
-        }  
-        color, 255 255 255 255;
+group {
+    name, "menu_item";
+    parts {
+       #include "parts/menu_item_parts.edc"
     }
-    description {
-        state, "active" 0.0;
-        min, 14 14;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 30 -1;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-        }
-        image {
-            normal, "e17_titlebar_outline.png";
-            border, 8 8 8 8;
-            middle, 0;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 0;
+    programs {
+        #include "programs/menu_item_progs.edc"
     }
 }
-part {
-    name, "title_shadow2";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow2.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 0;
-    }
-    description {
-        state, "active" 0.0;
-        visible, 1;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow2.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 255;
-    }
-}     
-part {
-    name, "title_shadow1";
-    mouse_events, 0;
-    description {   
-        state, "default" 0.0;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow1.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 0;
-    }     
-    description {   
-        state, "active" 0.0;
-        visible, 1;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow1.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 255;
-    }
-}
-part {
-    name, "title_bar";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar.png";
-            border, 8 8 8 8;
-        }
-        color, 255 255 255 0;
-    }  
-    description {
-        state, "active" 0.0;
-        visible, 1; 
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }  
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }  
-        image {
-            normal, "e17_titlebar.png";
-            border, 8 8 8 8;
-        }  
-        color, 255 255 255 255;
-    }  
-}  
-part {
-    name, "text";
-    type, TEXT;
-    effect, SHADOW;
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 8 6; 
-            to, "title_outline";
-        }  
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -8 -6;
-        }  
-        color, 0 0 0 255;
-        color3, 255 255 255 128;
-        text {
-            text, "Item Label";
-            font, "Vera";
-            size, 10;
-            min, 1 1;
-            align, 0.0 0.5;
-        }
-    }
-}
-part {
-    name, "title_glint_clip";
-    type, RECT;
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        rel1 {
-            offset, 3 3;
-            to, "title_bar";
-        }
-        rel2 {
-            offset, -4 -4;
-            to, "title_bar";
-        }
-        color, 255 255 255 255;
-    }
-}
-part {
-    name, "title_glint_1";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        align, 0.0 0.0;
-        max, 34 13;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 2 2;
-            to, "title_bar";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -3 -3;
-            to, "title_bar";
-        }
-        image {
-            normal, "e17_titlebar_glint1.png"; 
-            border, 5 0 5 0;
-        }  
-        fill {
-            smooth, 0;
-        }
-    } 
-    description {   
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-    }  
-}        
-part {   
-    name, "title_glint_2";
-    mouse_events, 0;
-    clip_to, "title_glint_clip";
-    description {   
-        state, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        align, 1.0 0.5;
-        max, 0 0;
-        rel1 {      
-            relative, 0.0 0.0;
-            offset, 3 3;
-            to, "title_bar";
-        }
-        rel2 {    
-            relative, 0.0 1.0;
-            offset, 3 -4;
-            to, "title_bar";
-        }  
-        image {
-            normal, "e17_titlebar_glint2.png";
-            border, 0 0 5 5;
-        }
-        fill {
-            smooth, 0;
-        }  
-    }  
-    description {
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.5 0.5;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 3 3;
-        }
-        rel2 {
-            relative, 0.0 1.0;
-            offset, 3 -4;
-        }
-    }
-    description {
-        state, "active2" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 128;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.5 0.5;
-        rel1 {
-            relative, 1.0 0.0;
-            offset, -4 3;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -4 -4;
-        }
-    }
-    description {
-        state, "active3" 0.0;
-        inherit, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.0 0.5;
-        rel1 {
-            relative, 1.0 0.0;
-            offset, -4 3;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -4 -4;
-        }
-    }  
-}     
-part {   
-    name, "title_glint_3";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0; 
-        color, 255 255 255 0;
-        align, 1.0 1.0;
-        max, 34 13;
-        rel1 {    
-            relative, 0.0 0.0;
-            offset, 2 2;
-            to, "title_bar";
-        }
-        rel2 {    
-            relative, 1.0 1.0;
-            offset, -3 -3;
-            to, "title_bar";
-        }  
-        image {
-            normal, "e17_titlebar_glint3.png";
-            border, 0 5 0 5;
-        }  
-        fill {
-            smooth, 0;
-        }
-    }  
-    description {
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-    }  
-}     
-




-------------------------------------------------------
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to