Enlightenment CVS committal

Author  : moom16
Project : e17
Module  : proto

Dir     : e17/proto/etk/data/themes/default/widgets


Modified Files:
        menu.edc scrollbar.edc windows.edc 
Added Files:
        statusbar.edc 


Log Message:
* More work on the menus
* Add a menu bar (need some theming)
* Add a status bar (the resize grip doesn't work yet)
* Clean up etk_test
* Some minor fixes and new things




===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/menu.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- menu.edc    13 Nov 2005 12:04:04 -0000      1.2
+++ menu.edc    20 Nov 2005 10:33:28 -0000      1.3
@@ -65,28 +65,6 @@
    }
 }
 group {
-   name: "menu_arrow";
-   parts {
-      part {
-         name: "arrow";
-         description {
-            state: "default" 0.0;
-            rel1 {
-               relative: 0.5 0.5;
-               offset: -6 -6;
-            }
-            rel2 {
-               relative: 0.5 0.5;
-               offset: 6 5;
-            }
-            image {
-               normal: "menu_arrow.png";
-            }
-         }
-      }
-   }
-}
-group {
    name: "menu_item";
    parts {
       part {
@@ -153,11 +131,11 @@
             state: "visible" 0.0;
             rel1 {
                relative: 1.0 0.5;
-               offset: -13 -6;
+               offset: -19 -8;
             }
             rel2 {
                relative: 1.0 0.5;
-               offset: -1 5;
+               offset: -4 7;
             }
          }
       }
@@ -611,94 +589,600 @@
    }
 }
 group {
-   name: "menu_separator";
+   name: "menu_bar";
    parts {
       part {
-         name: "separator";
-         mouse_events: 0;
+         name: "menu_bar";
          description {
             state: "default" 0.0;
-            min: 0 2;
+           rel1 {
+              relative: 0.0 0.0;
+              offset: 0 0;
+           }
+           rel2 {
+              relative: 1.0 1.0;
+              offset: -1 -1;
+           }
+            image {
+               normal: "menu_bar.png";
+            }
+         }
+      }
+   }
+}
+group {
+   name: "menu_bar_item";
+   parts {
+      part {
+         name: "item_rect";
+         type: RECT;
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 0;
             rel1 {
                relative: 0.0 0.0;
-               offset: 2 2;
+               offset: 0 0;
             }
             rel2 {
                relative: 1.0 1.0;
-               offset: -3 -3;
+               offset: -1 -1;
             }
-            image {
-               normal: "menu_separator.png";
-               border: 3 3 0 0;
+         }
+      }
+      part {
+         name: "image_swallow";
+         type: SWALLOW;
+         mouse_events: 0;
+         description {
+            state: "invisible" 0.0;
+            visible: 0;
+            rel1 {
+               relative: 0.0 0.0;
+               offset: 0 0;
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               offset: 0 -1;
+            }
+         }
+         description {
+            state: "visible" 0.0;
+            rel1 {
+               relative: 0.0 0.5;
+               offset: 3 -8;
+            }
+            rel2 {
+               relative: 0.0 0.5;
+               offset: 18 7;
             }
-           fill {
-              smooth: 0;
-           }
          }
       }
-   }
-}
-group {
-   name: "menu_checkbox";
-   parts {
       part {
-         name: "check";
+         name: "right_swallow";
+         type: SWALLOW;
+         mouse_events: 0;
+         description {
+            state: "invisible" 0.0;
+            visible: 0;
+            rel1 {
+               relative: 1.0 0.0;
+               offset: -1 0;
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -1 -1;
+            }
+         }
+      }
+      part {
+         name: "item_shadow2";
          mouse_events: 0;
          description {
             state: "default" 0.0;
-            min: 16 16;
-            max: 16 16;
+            visible: 0;
+            color: 255 255 255 255;
             rel1 {
-               relative: 0.0 0.0;
-               offset: 1 1;
+               relative: 1.0 0.0;
+               offset: 0 0;
+               to_x: "image_swallow";
             }
             rel2 {
                relative: 1.0 1.0;
-               offset: -2 -2;
+               offset: -1 -1;
             }
             image {
-               normal: "checkbox_off.png";
+               normal: "menu_item_shadow2.png";
+               border: 8 8 8 8;
             }
          }
          description {
-            state: "checked" 0.0;
+            state: "active" 0.0;
             inherit: "default" 0.0;
+            visible: 1;
+            color: 255 255 255 255;
+         }
+      }
+      part {
+         name: "item_shadow1";
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            color: 255 255 255 255;
+            rel1 {
+               relative: 1.0 0.0;
+               offset: 0 0;
+               to_x: "image_swallow";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -1 -1;
+            }
             image {
-               normal: "checkbox_on.png";
+               normal: "menu_item_shadow1.png";
+               border: 8 8 8 8;
             }
          }
+         description {
+            state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            color: 255 255 255 255;
+         }
       }
-   }
-}
-group {
-   name: "menu_radio";
-   parts {
       part {
-         name: "radio";
+         name: "item_highlight";
          mouse_events: 0;
          description {
             state: "default" 0.0;
-            min: 16 16;
-            max: 16 16;
+            visible: 0;
+            color: 255 255 255 0;
             rel1 {
-               relative: 0.0 0.0;
-               offset: 1 1;
+               relative: 1.0 0.0;
+               offset: 0 0;
+               to_x: "image_swallow";
             }
             rel2 {
                relative: 1.0 1.0;
-               offset: -2 -2;
+               offset: -1 -1;
             }
             image {
-               normal: "radio_off.png";
+               normal: "menu_item_highlight.png";
+               border: 8 8 8 8;
             }
          }
          description {
-            state: "on" 0.0;
+            state: "active" 0.0;
             inherit: "default" 0.0;
+            visible: 1;
+            color: 255 255 255 255;
+         }
+      }
+      part {
+         name: "label";
+         type: TEXT;
+         mouse_events:   0;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 255;
+            rel1 {
+               relative: 1.0 0.0;
+               offset: 13 6;
+               to_x: "image_swallow";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -14 -7;
+            }
+            text {
+               text: "label";
+               font: "Vera";
+               size:  10;
+               min: 1 1;
+               align: 0.0 0.5;
+            }
+         }
+      }
+      part {
+         name: "glint_clip";
+         type: RECT;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 255;
+            rel1 {
+               offset: 3 3;
+               to: "item_highlight";
+            }
+            rel2 {
+               offset: -4 -4;
+               to: "item_highlight";
+            }
+         }
+      }
+      part {
+         name: "glint1";
+         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: "item_highlight";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -3 -3;
+               to: "item_highlight";
+            }
             image {
-               normal: "radio_on.png";
+               normal: "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: "glint2";
+         mouse_events: 0;
+         clip_to: "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: "item_highlight";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               offset: 3 -4;
+               to: "item_highlight";
+            }
+            image {
+               normal: "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: "glint3";
+         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: "item_highlight";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -3 -3;
+               to: "item_highlight";
+            }
+            image {
+               normal: "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;
+         }
+      }
+   }
+   programs {
+      program {
+         name: "go_active_pre";
+         signal: "select";
+         source: "";
+         action: STATE_SET "default" 0.0;
+         target: "item_highlight";
+         target: "item_shadow1";
+         target: "item_shadow2";
+         after: "go_active";
+      }
+      program {
+         name: "go_active";
+         action: STATE_SET "active" 0.0;
+         target: "item_highlight";
+         transition: LINEAR 0.05;
+         after: "go_active2";
+      }
+      program {
+         name: "go_active2";
+         action: STATE_SET "active" 0.0;
+         target: "item_shadow1";
+         transition: LINEAR 0.05;
+         after: "go_active3";
+         after: "go_active3b";
+      }
+      program {
+         name: "go_active3";
+         action: STATE_SET "active" 0.0;
+         target: "item_shadow2";
+         transition: LINEAR 0.05;
+      }
+      program {
+         name: "go_active3b";
+         action: STATE_SET "active" 0.0;
+         target: "glint1";
+         target: "glint2";
+         transition: LINEAR 0.05;
+         after: "go_active4";
+         after: "go_active4b";
+      }
+      program {
+         name: "go_active4";
+         action: STATE_SET "active2" 0.0;
+         target: "glint2";
+         transition: LINEAR 0.2;
+         after: "go_active5";
+         after: "go_active5b";
+      }
+      program {
+         name: "go_active4b";
+         action: STATE_SET "active" 0.0;
+         target: "glint3";
+         transition: LINEAR 0.2;
+      }
+      program {
+         name: "go_active5";
+         action: STATE_SET "active3" 0.0;
+         target: "glint2";
+         transition: LINEAR 0.05;
+      }
+      program {
+         name: "go_active5b";
+         action: STATE_SET "default" 0.0;
+         target: "glint3";
+         transition: LINEAR 0.1;
+         after: "go_active6";
+      }
+      program {
+         name: "go_active6";
+         action: STATE_SET "default" 0.0;
+         target: "glint1";
+         target: "glint2";
+         target: "glint3";
+      }
+
+      program {
+         name: "go_passive_pre";
+         signal: "deselect";
+         source: "";
+         action: STATE_SET "active" 0.0;
+         target: "item_highlight";
+         target: "item_shadow1";
+         target: "item_shadow2";
+         after: "go_passive";
+      }
+      program {
+         name: "go_passive";
+         action: STATE_SET "default" 0.0;
+         target: "item_shadow2";
+         transition: LINEAR 0.1;
+         after: "go_passive2";
+      }
+      program {
+         name: "go_passive2";
+         action: STATE_SET "default" 0.0;
+         target: "item_shadow1";
+         transition: LINEAR 0.1;
+         after: "go_passive3";
+      }
+      program {
+         name: "go_passive3";
+         action: STATE_SET "default" 0.0;
+         target: "item_highlight";
+         transition: LINEAR 0.1;
+      }
+      
+      program {
+         name: "image_show";
+         signal: "image_show";
+         source: "";
+         action: STATE_SET "visible" 0.0;
+         target: "image_swallow";
+      }
+      program {
+         name: "image_hide";
+         signal: "image_hide";
+         source: "";
+         action: STATE_SET "invisible" 0.0;
+         target: "image_swallow";
+      }
+   }
+}
+group {
+   name: "menu_arrow";
+   parts {
+      part {
+         name: "arrow";
+         description {
+            state: "default" 0.0;
+            rel1 {
+               relative: 0.5 0.5;
+               offset: -6 -6;
+            }
+            rel2 {
+               relative: 0.5 0.5;
+               offset: 6 5;
+            }
+            image {
+               normal: "menu_arrow.png";
+            }
+         }
+      }
+   }
+}
+group {
+   name: "menu_checkbox";
+   parts {
+      part {
+         name: "check";
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: 16 16;
+            max: 16 16;
+            rel1 {
+               relative: 0.0 0.0;
+               offset: 1 1;
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -2 -2;
+            }
+            image {
+               normal: "checkbox_off.png";
+            }
+         }
+         description {
+            state: "checked" 0.0;
+            inherit: "default" 0.0;
+            image {
+               normal: "checkbox_on.png";
+            }
+         }
+      }
+   }
+}
+group {
+   name: "menu_radio";
+   parts {
+      part {
+         name: "radio";
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: 16 16;
+            max: 16 16;
+            rel1 {
+               relative: 0.0 0.0;
+               offset: 1 1;
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -2 -2;
+            }
+            image {
+               normal: "radio_off.png";
+            }
+         }
+         description {
+            state: "on" 0.0;
+            inherit: "default" 0.0;
+            image {
+               normal: "radio_on.png";
+            }
+         }
+      }
+   }
+}
+group {
+   name: "menu_separator";
+   parts {
+      part {
+         name: "separator";
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: 0 2;
+            rel1 {
+               relative: 0.0 0.0;
+               offset: 2 2;
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -3 -3;
+            }
+            image {
+               normal: "menu_separator.png";
+               border: 3 3 0 0;
+            }
+           fill {
+              smooth: 0;
+           }
+         }
       }
    }
 }
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/scrollbar.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- scrollbar.edc       2 Nov 2005 13:53:37 -0000       1.4
+++ scrollbar.edc       20 Nov 2005 10:33:28 -0000      1.5
@@ -28,20 +28,21 @@
             visible: 0;
             rel1 {
                relative: 0.0 0.5;
-               offset: 16 9;
+               offset: 16 7;
             }
             rel2 {
                relative: 1.0 0.5;
-               offset: -33 9;
+               offset: -34 7;
             }
          }
       }
-      SCROLLBAR_DRAG("drag", 20, 20, 1, 0, "scrollbar_hdrag_thumb.png")
-      SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, -1, -9, 
"scrollbar_arrow_left.png")
-      SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -34, -9, 
"scrollbar_arrow_left.png")
-      SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -18, -9, 
"scrollbar_arrow_right.png")
+      SCROLLBAR_DRAG("drag", 20, 16, 1, 0, "scrollbar_hdrag1.png", 
"scrollbar_hdrag2.png", "scrollbar_hdrag_thumb.png")
+      SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, 0, -8, 
"scrollbar_button_left1.png", "scrollbar_button_left2.png")
+      SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -33, -8, 
"scrollbar_button_left1.png", "scrollbar_button_left2.png")
+      SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -17, -8, 
"scrollbar_button_right1.png", "scrollbar_button_right2.png")
    }
    programs {
+      SCROLLBAR_DRAG_PROG("drag")
       SCROLLBAR_BUTTON_PROG("left_left_arrow", "left")
       SCROLLBAR_BUTTON_PROG("right_left_arrow", "left")
       SCROLLBAR_BUTTON_PROG("right_right_arrow", "right")
@@ -78,20 +79,21 @@
             visible: 0;
             rel1 {
                relative: 0.5 0.0;
-               offset: 9 16;
+               offset: 7 16;
             }
             rel2 {
                relative: 0.5 1.0;
-               offset: 9 -33;
+               offset: 7 -34;
             }
          }
       }
-      SCROLLBAR_DRAG("drag", 20, 20, 0, 1, "scrollbar_vdrag_thumb.png")
-      SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -9, -1, 
"scrollbar_arrow_up.png")
-      SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -9, -34, 
"scrollbar_arrow_down.png")
-      SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -9, -18, 
"scrollbar_arrow_down.png")
+      SCROLLBAR_DRAG("drag", 16, 20, 0, 1, "scrollbar_vdrag1.png", 
"scrollbar_vdrag2.png", "scrollbar_vdrag_thumb.png")
+      SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -8, 0, 
"scrollbar_button_up1.png", "scrollbar_button_up2.png")
+      SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -8, -33, 
"scrollbar_button_up1.png", "scrollbar_button_up2.png")
+      SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -8, -17, 
"scrollbar_button_down1.png", "scrollbar_button_down2.png")
    }
    programs {
+      SCROLLBAR_DRAG_PROG("drag")
       SCROLLBAR_BUTTON_PROG("up_up_arrow", "up")
       SCROLLBAR_BUTTON_PROG("down_up_arrow", "up")
       SCROLLBAR_BUTTON_PROG("down_down_arrow", "down")
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/windows.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- windows.edc 11 Nov 2005 22:48:48 -0000      1.4
+++ windows.edc 20 Nov 2005 10:33:28 -0000      1.5
@@ -1,7 +1,7 @@
 group {
    name: "window";
    data {
-      item: "inset" "5 5 5 5";
+      item: "inset" "1 1 1 1";
    }
    parts {
       part {
@@ -42,6 +42,7 @@
       }
       part {
          name: "border";
+         mouse_events: 0;
          description {
             state: "default" 0.0;
             rel1 {




-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to