Enlightenment CVS committal

Author  : titan
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/data/themes/e17/groups


Modified Files:
        notebook.edc scroll.edc spinner.edc tree.edc 


Log Message:
New theme work for Scrollpanes/Notebooks/Trees/Spinners/and Seekers.

===================================================================
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/notebook.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- notebook.edc        19 Apr 2007 02:56:06 -0000      1.2
+++ notebook.edc        28 Jun 2007 21:29:36 -0000      1.3
@@ -1,11 +1,14 @@
 images
 {
-       image: "e17_button_sm_disabled.png" COMP;
        image: "e17_frame_outline.png" COMP;
-       image: "ewl_notebook_tab_top_selected.png" COMP;
+       image: "ewl_notebook_tab_bottom.png" COMP;
        image: "ewl_notebook_tab_bottom_selected.png" COMP;
+       image: "ewl_notebook_tab_left.png" COMP;
        image: "ewl_notebook_tab_left_selected.png" COMP;
+       image: "ewl_notebook_tab_right.png" COMP;
        image: "ewl_notebook_tab_right_selected.png" COMP;
+       image: "ewl_notebook_tab_top.png" COMP;
+       image: "ewl_notebook_tab_top_selected.png" COMP;
 }
 
 group
@@ -100,7 +103,8 @@
 
        data
        {
-               item: "pad" 0;
+               item: "pad" 2;
+               item: "pad/bottom" 0;
                item: "inset" 4;
                item: "inset/top" 2;
                item: "inset/bottom" 0;
@@ -119,28 +123,26 @@
                                rel1
                                {
                                        relative: 0.0 0.0;
-                                       offset: -2 0;
+                                       offset: 0 0;
                                }
                                rel2
                                {
                                        relative: 1.0 1.0;
-                                       offset: 2 4;
+                                       offset: -1 -1;
                                }
                                image
                                {
-                                       normal: "e17_button_sm_disabled.png";
-                                       border: 8 8 8 8;
+                                       normal: "ewl_notebook_tab_top.png";
+                                       border: 4 4 4 1;
                                }
                        }
                        description
                        {
                                state: "selected" 0.0;
-                               inherit: "default" 0.0;
-                               visible: 1;
                                image
                                {
                                        normal: 
"ewl_notebook_tab_top_selected.png";
-                                       border: 8 8 8 8;
+                                       border: 4 4 4 1;
                                }
                        }
                }
@@ -172,7 +174,8 @@
 
        data
        {
-               item: "pad" 0;
+               item: "pad" 2;
+               item: "pad/top" 0;
                item: "inset" 4;
                item: "inset/top" 0;
                item: "inset/bottom" 4;
@@ -191,28 +194,27 @@
                                rel1
                                {
                                        relative: 0.0 0.0;
-                                       offset: -2 -5;
+                                       offset: 0 0;
                                }
                                rel2
                                {
                                        relative: 1.0 1.0;
-                                       offset: 2 -1;
+                                       offset: -1 -1;
                                }
                                image
                                {
-                                       normal: "e17_button_sm_disabled.png";
-                                       border: 8 8 8 8;
+                                       normal: "ewl_notebook_tab_bottom.png";
+                                       border: 4 4 1 4;
                                }
                        }
                        description
                        {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
-                               visible: 1;
                                image
                                {
                                        normal: 
"ewl_notebook_tab_bottom_selected.png";
-                                       border: 8 8 8 8;
+                                       border: 4 4 1 4;
                                }
                        }
                }
@@ -257,7 +259,8 @@
 
        data
        {
-               item: "pad" 0;
+               item: "pad" 2;
+               item: "pad/right" 0;
                item: "inset" 4;
                item: "inset/left" 2;
                item: "inset/right" 0;
@@ -281,23 +284,22 @@
                                rel2
                                {
                                        relative: 1.0 1.0;
-                                       offset: 8 -1;
+                                       offset: -1 -1;
                                }
                                image
                                {
-                                       normal: "e17_button_sm_disabled.png";
-                                       border: 8 8 8 8;
+                                       normal: "ewl_notebook_tab_left.png";
+                                       border: 4 1 4 4;
                                }
                        }
                        description
                        {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
-                               visible: 1;
                                image
                                {
                                        normal: 
"ewl_notebook_tab_left_selected.png";
-                                       border: 8 8 8 8;
+                                       border: 4 1 4 4;
                                }
                        }
                }
@@ -329,7 +331,8 @@
 
        data
        {
-               item: "pad" 0;
+               item: "pad" 2;
+               item: "pad/left" 0;
                item: "inset" 4;
                item: "inset/left" 0;
                item: "inset/right" 2;
@@ -348,7 +351,7 @@
                                rel1
                                {
                                        relative: 0.0 0.0;
-                                       offset: -18 0;
+                                       offset: 0 0;
                                }
                                rel2
                                {
@@ -357,8 +360,8 @@
                                }
                                image
                                {
-                                       normal: "e17_button_sm_disabled.png";
-                                       border: 8 8 8 8;
+                                       normal: "ewl_notebook_tab_right.png";
+                                       border: 1 4 4 4;
                                }
                        }
                        description
@@ -369,7 +372,7 @@
                                image
                                {
                                        normal: 
"ewl_notebook_tab_right_selected.png";
-                                       border: 8 8 8 8;
+                                       border: 1 4 4 4;
                                }
                        }
                }
===================================================================
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/scroll.edc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- scroll.edc  14 Jun 2007 19:28:44 -0000      1.8
+++ scroll.edc  28 Jun 2007 21:29:36 -0000      1.9
@@ -2,6 +2,12 @@
 {
        image: "e17_ibar_bg_v.png" COMP;
        image: "e17_ibar_over_v.png" COMP;
+       image: "e17_ibar_handle_h.png" COMP;
+       image: "e17_ibar_handle_h2.png" COMP;
+       image: "e17_ibar_handle_thumb_h.png" COMP;
+       image: "e17_ibar_handle_thumb_v.png" COMP;
+       image: "e17_ibar_handle_v.png" COMP;
+       image: "e17_ibar_handle_v2.png" COMP;
        image: "e17_menu_separator.png" COMP;
        image: "e17_menu_separator_vert.png" COMP;
        image: "e17_scrollbar_vdrag_thumb.png" COMP;
@@ -26,9 +32,7 @@
 
        data
        {
-               item: "inset" 9;
-               item: "inset/bottom" 5;
-               item: "inset/right" 5;
+               item: "inset" 2;
        }
 
        parts
@@ -43,7 +47,7 @@
                                image
                                {
                                        normal: "e17_ibar_bg_v.png";
-                                       border: 7 7 7 7;
+                                       border: 2 2 2 2;
                                }
                                fill
                                {
@@ -53,24 +57,15 @@
                }
                part
                {
-                       name: "overlay";
+                       name: "over";
                        mouse_events: 0;
                        description
                        {
                                state: "default" 0.0;
-                               rel1
-                               {
-                                       to: "bg";
-                               }
-                               rel2
-                               {
-                                       to: "bg";
-                               }
                                image
                                {
                                        normal: "e17_ibar_over_v.png";
-                                       border: 13 13 13 13;
-                                       middle: 0;
+                                       border: 6 6 6 6;
                                }
                                fill
                                {
@@ -128,6 +123,102 @@
 group
 {
        name: "ewl/seeker/vertical/button";
+       min: 20 30;
+
+       parts
+       {
+               part
+               {
+                       name: "drag";
+                       description
+                       {
+                               state: "default" 0.0;
+                               min: 18 30;
+                               max: 18 99999;
+                               image
+                               {
+                                       normal: "e17_ibar_handle_h.png";
+                                       border: 8 8 8 8;
+                               }
+                               fill
+                               {
+                                       smooth: 0;
+                               }
+                       }
+                       description
+                       {
+                               state: "down" 0.0;
+                               inherit: "default" 0.0;
+                               image
+                               {
+                                       normal: "e17_ibar_handle_h2.png";
+                               }
+                       }
+               }
+               part
+                {
+                        name: "drag_thumb";
+                        mouse_events: 0;
+                        description
+                        {
+                                state: "default" 0.0;
+                                max: 6 16;
+                                min: 6 16;
+
+                                rel1
+                                {
+                                        relative: 0.5 0.5;
+                                        offset: -4 -9;
+                                        to: "drag";
+                                }
+                                rel2
+                                {
+                                        relative: 0.5 0.5;
+                                        offset: 1 6;
+                                        to: "drag";
+                                }
+                                image
+                                {
+                                        normal: "e17_ibar_handle_thumb_h.png";
+                                }
+                        }
+                       description
+                       {
+                               state: "down" 0.0;
+                               inherit: "default" 0.0;
+                               rel1
+                               {
+                                       offset: -2 -9;
+                               }
+                       }
+               }
+       }
+       programs
+        {
+                program
+                {
+                        name: "drag_down";
+                        signal: "mouse,down,*";
+                        source: "EWL";
+                        action: STATE_SET "down" 0.0;
+                        target: "drag";
+                       target: "drag_thumb";
+               }
+                program
+                {
+                        name: "drag_up";
+                        signal: "mouse,up,*";
+                        source: "EWL";
+                        action: STATE_SET "default" 0.0;
+                        target: "drag";
+                       target: "drag_thumb";
+                }
+        }
+}
+
+group
+{
+       name: "ewl/scrollbar/vertical/button";
        min: 18 18;
 
        parts
@@ -213,6 +304,102 @@
 group
 {
        name: "ewl/seeker/horizontal/button";
+       min: 30 20;
+
+       parts
+       {
+               part
+               {
+                       name: "drag";
+                       description
+                       {
+                               state: "default" 0.0;
+                               min: 30 18;
+                                max: 99999 18;
+                                image
+                                {
+                                        normal: "e17_ibar_handle_v.png";
+                                        border: 8 8 8 8;
+                                }
+                                fill
+                                {
+                                        smooth: 0;
+                                }
+                        }
+                        description
+                        {
+                                state: "down" 0.0;
+                                inherit: "default" 0.0;
+                                image
+                                {
+                                        normal: "e17_ibar_handle_v2.png";
+                                }
+                        }
+                }
+               part
+               {
+                        name: "drag_thumb";
+                        mouse_events: 0;
+                        description
+                        {
+                                state: "default" 0.0;
+                                max: 16 6;
+                                min: 16 6;
+
+                                rel1
+                                {
+                                        relative: 0.5 0.5;
+                                        offset: -9 -4;
+                                        to: "drag";
+                                }
+                                rel2
+                                {
+                                        relative: 0.5 0.5;
+                                        offset: 6 1;
+                                        to: "drag";
+                                }
+                                image
+                                {
+                                        normal: "e17_ibar_handle_thumb_v.png";
+                                }
+                        }
+                       description
+                       {
+                               state: "down" 0.0;
+                               inherit: "default" 0.0;
+                               rel1
+                               {
+                                       offset: -9 -2;
+                               }
+                       }
+                }
+       }
+       programs
+        {
+                program
+                {
+                        name: "drag_down";
+                        signal: "mouse,down,*";
+                        source: "EWL";
+                        action: STATE_SET "down" 0.0;
+                        target: "drag";
+                       target: "drag_thumb";
+                }
+                program
+                {
+                        name: "drag_up";
+                        signal: "mouse,up,*";
+                        source: "EWL";
+                        action: STATE_SET "default" 0.0;
+                        target: "drag";
+                       target: "drag_thumb";
+                }
+        }
+}
+
+group
+{
+       name: "ewl/scrollbar/horizontal/button";
        min: 18 18;
 
        parts
===================================================================
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/spinner.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- spinner.edc 26 Jun 2007 19:39:31 -0000      1.2
+++ spinner.edc 28 Jun 2007 21:29:36 -0000      1.3
@@ -20,14 +20,14 @@
                        description
                        {
                                state: "default" 0.0;
-                               align: 0.5 1.0;
+                               align: 0.5 0.5;
                                aspect: 1.0 1.0;
                                aspect_preference: HORIZONTAL;
        
                                rel1
                                {
                                        relative: 0.0 0.0;
-                                       offset: 0 -1;
+                                       offset: 0 -2;
                                }
                                rel2
                                {
@@ -85,14 +85,14 @@
                        description
                        {
                                state: "default" 0.0;
-                               align: 0.5 1.0;
+                               align: 0.5 0.5;
                                aspect: 1.0 1.0;
                                aspect_preference: HORIZONTAL;
        
                                rel1
                                {
                                        relative: 0.0 0.0;
-                                       offset: 0 -1;
+                                       offset: 0 0;
                                }
                                rel2
                                {
===================================================================
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/tree.edc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- tree.edc    26 Jun 2007 19:39:32 -0000      1.17
+++ tree.edc    28 Jun 2007 21:29:36 -0000      1.18
@@ -2,7 +2,6 @@
 {
        image: "e17_button_detail_up.png" COMP;
        image: "e17_button_detail_down.png" COMP;
-       image: "e17_button_sm_disabled.png" COMP;
        image: "e17_icon_right_arrow.png" COMP;
        image: "e17_icon_down_arrow.png" COMP;
 }
@@ -13,9 +12,7 @@
 
        data
        {
-               item: "inset" 1;
-               item: "inset/top" 4;
-               item: "inset/bottom" 0;
+               item: "inset" 2;
        }
 
        parts
@@ -30,7 +27,7 @@
                                image
                                {
                                        normal: "e17_ibar_bg_v.png";
-                                       border: 7 7 7 7;
+                                       border: 2 2 2 2;
                                }
                                fill
                                {
@@ -40,23 +37,15 @@
                }
                part
                {
-                       name: "overlay";
+                       name: "over";
                        mouse_events: 0;
                        description
                        {
                                state: "default" 0.0;
-                               rel1
-                               {
-                                       to: "bg";
-                               }
-                               rel2
-                               {
-                                       to: "bg";
-                               }
                                image
                                {
                                        normal: "e17_ibar_over_v.png";
-                                       border: 13 13 13 13;
+                                       border: 6 6 6 6;
                                        middle: 0;
                                }
                                fill
@@ -70,7 +59,7 @@
 
 group
 {
-    name: "ewl/tree/scrollpane/background";
+       name: "ewl/tree/scrollpane/background";
 }
 
 group
@@ -78,10 +67,7 @@
        name: "ewl/tree/vbox";
        data
        {
-               item: "inset/top" 7;
-               item: "inset/bottom" 5;
-               item: "inset/left" 10;
-               item: "inset/right" 6;
+               item: "inset" 1;
        }
 }
 
@@ -104,8 +90,8 @@
                        }
                        description
                        {
-                       state: "hidden" 0.0;
-                       visible: 0;
+                               state: "hidden" 0.0;
+                               visible: 0;
                        }
                }
                part
@@ -113,7 +99,6 @@
                        name: "expansion";
                        mouse_events: 1;
                        clip_to: "clip";
-
                        description
                        {
                                state: "default" 0.0;
@@ -181,6 +166,7 @@
        data
        {
                item: "pad" 0;
+               item: "pad/bottom" 2;
                item: "inset" 4;
        }
 
@@ -197,12 +183,12 @@
                                rel1
                                {
                                        relative: 0.0 0.0;
-                                       offset: 0 0;
+                                       offset: -1 -1;
                                }
                                rel2
                                {
                                        relative: 1.0 1.0;
-                                       offset: -1 -1;
+                                       offset: 1 -1;
                                }
                                image
                                {



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to