Enlightenment CVS committal
Author : dj2
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/data/entangle/default
Modified Files:
button.edc button_progs.edc default.edc
Added Files:
menu_item.edc menu_item_progs.edc
Log Message:
- patch from Mathieu Lamar (Sativas) fixing up entangles UI. Thanks.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/button.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- button.edc 29 Apr 2005 01:55:49 -0000 1.1
+++ button.edc 16 May 2005 00:27:32 -0000 1.2
@@ -1,190 +1,35 @@
-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;
- }
- 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;
- }
-}
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;
- }
+ name: "button";
+ mouse_events, 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;
+ 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, "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;
@@ -193,12 +38,11 @@
state, "default" 0.0;
rel1 {
relative, 0.0 0.0;
- offset, 8 6;
- to, "title_outline";
+ offset, 8 2;
}
rel2 {
relative, 1.0 1.0;
- offset, -8 -6;
+ offset, -6 -2;
}
color, 0 0 0 255;
color3, 255 255 255 128;
@@ -207,7 +51,7 @@
font, "Vera";
size, 10;
min, 1 1;
- align, 0.0 0.5;
+ align, 0.5 0.5;
}
}
}
@@ -219,11 +63,11 @@
state, "default" 0.0;
rel1 {
offset, 3 3;
- to, "title_bar";
+ to, "button";
}
rel2 {
offset, -4 -4;
- to, "title_bar";
+ to, "button";
}
color, 255 255 255 255;
}
@@ -240,12 +84,12 @@
rel1 {
relative, 0.0 0.0;
offset, 2 2;
- to, "title_bar";
+ to, "button";
}
rel2 {
relative, 1.0 1.0;
offset, -3 -3;
- to, "title_bar";
+ to, "button";
}
image {
normal, "e17_titlebar_glint1.png";
@@ -275,12 +119,12 @@
rel1 {
relative, 0.0 0.0;
offset, 3 3;
- to, "title_bar";
+ to, "button";
}
rel2 {
relative, 0.0 1.0;
offset, 3 -4;
- to, "title_bar";
+ to, "button";
}
image {
normal, "e17_titlebar_glint2.png";
@@ -354,12 +198,12 @@
rel1 {
relative, 0.0 0.0;
offset, 2 2;
- to, "title_bar";
+ to, "button";
}
rel2 {
relative, 1.0 1.0;
offset, -3 -3;
- to, "title_bar";
+ to, "button";
}
image {
normal, "e17_titlebar_glint3.png";
@@ -375,5 +219,4 @@
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.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- button_progs.edc 29 Apr 2005 01:55:49 -0000 1.1
+++ button_progs.edc 16 May 2005 00:27:33 -0000 1.2
@@ -1,38 +1,8 @@
+
program {
- name, "go_active_pre";
+ name, "go_active3b";
signal, "mouse,in";
source, "*";
- action, STATE_SET "default" 0.0;
- target, "title_outline";
- target, "title_bar";
- target, "title_shadow1";
- target, "title_shadow2";
- after, "go_active";
- }
- program {
- name, "go_active";
- action, STATE_SET "active" 0.0;
- target, "title_outline";
- target, "title_bar";
- transition, LINEAR 0.05;
- after, "go_active2";
- }
- program {
- name, "go_active2";
- action, STATE_SET "active" 0.0;
- target, "title_shadow1";
- transition, LINEAR 0.05;
- after, "go_active3";
- after, "go_active3b";
- }
- program {
- name, "go_active3";
- action, STATE_SET "active" 0.0;
- target, "title_shadow2";
- transition, LINEAR 0.05;
- }
- program {
- name, "go_active3b";
action, STATE_SET "active" 0.0;
target, "title_glint_1";
target, "title_glint_2";
@@ -75,36 +45,22 @@
target, "title_glint_3";
}
- program {
- name, "go_passive_pre";
- signal, "mouse,out";
- source, "*";
- action, STATE_SET "active" 0.0;
- target, "title_outline";
- target, "title_bar";
- target, "title_shadow1";
- target, "title_shadow2";
- after, "go_passive";
- }
- program {
- name, "go_passive";
- action, STATE_SET "default" 0.0;
- target, "title_shadow2";
- transition, LINEAR 0.1;
- after, "go_passive2";
- }
- program {
- name, "go_passive2";
- action, STATE_SET "default" 0.0;
- target, "title_shadow1";
- transition, LINEAR 0.1;
- after, "go_passive3";
- }
- program {
- name, "go_passive3";
- action, STATE_SET "default" 0.0;
- target, "title_outline";
- target, "title_bar";
- transition, LINEAR 0.1;
- }
+program
+{
+ name, "button_down";
+ signal, "mouse,down,1";
+ source, "overlay";
+ action, STATE_SET "clicked" 0.0;
+ target, "button";
+
+}
+program
+{
+ name, "button_up";
+ signal, "mouse,up,1";
+ source, "overlay";
+ action, STATE_SET "default" 0.0;
+ target, "button";
+
+}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/default.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- default.edc 29 Apr 2005 01:55:49 -0000 1.1
+++ default.edc 16 May 2005 00:27:33 -0000 1.2
@@ -17,6 +17,12 @@
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;
}
fonts {
@@ -81,12 +87,12 @@
state, "default" 0.0;
rel1 {
relative, 0.0 0.0;
- offset, -11 2;
+ offset, -9 2;
to, "title";
}
rel2 {
relative, 0.0 0.0;
- offset, 0 16;
+ offset, 3 17;
to, "title";
}
image {
@@ -131,6 +137,7 @@
name, "eapps_bar_body";
description {
state, "default" 0.0;
+ color, 255 255 255 220;
rel1 {
relative, 0.0 0.0;
offset, 28 0;
@@ -140,21 +147,26 @@
offset, 80 -80;
}
image {
- normal, "panel.png";
- border, 3 3 3 3;
+ normal, "e17_ibar_bg_v.png";
+ border, 13 13 13 13;
}
- fill {
- origin {
- relative, 0.0 0.0;
- offset, 0 0;
- }
- size {
- relative, 1.0 1.0;
- offset, 0 0;
- }
- }
- }
- }
+ }
+ }
+ 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;
@@ -162,11 +174,11 @@
state, "default" 0.0;
rel1 {
to, "eapps_bar_body";
- offset, 0 24;
+ offset, 0 28;
}
rel2 {
to, "eapps_bar_body";
- offset, 0 -24;
+ offset, 0 -28;
}
}
}
@@ -178,14 +190,15 @@
state, "default" 0.0;
min, 29 21;
max, 29 21;
+ color, 255 255 255 180;
rel1 {
relative, 0.0 0.0;
- offset, 0 4;
+ offset, 0 6;
to, "eapps_bar_body";
}
rel2 {
relative, 1.0 0.0;
- offset, 0 24;
+ offset, 0 27;
to, "eapps_bar_body";
}
image {
@@ -221,14 +234,15 @@
state, "default" 0.0;
min, 29 21;
max, 29 21;
+ color, 255 255 255 180;
rel1 {
relative, 0.0 1.0;
- offset, 0 -4;
+ offset, 0 -6;
to, "eapps_bar_body";
}
rel2 {
relative, 1.0 1.0;
- offset, 0 -24;
+ offset, 0 -27;
to, "eapps_bar_body";
}
image {
@@ -265,25 +279,15 @@
visible, 0;
rel1 {
relative, 0.0 1.0;
- offset, 28 -75;
+ offset, 28 -79;
}
rel2 {
relative, 0.0 1.0;
- offset, 200 -46;
+ offset, 200 -40;
}
- image {
- normal, "panel.png";
- border, 3 3 3 3;
- }
- fill {
- origin {
- relative, 0.0 0.0;
- offset, 0 0;
- }
- size {
- relative, 1.0 1.0;
- offset, 0 0;
- }
+ image {
+ normal, "e17_ibar_bg_v.png";
+ border, 13 13 13 13;
}
}
description {
@@ -292,6 +296,26 @@
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;
@@ -300,7 +324,7 @@
visible, 0;
rel1 {
relative, 0.0 0.0;
- offset, 2 2;
+ offset, 2 14;
to, "eapp_info";
}
rel2 {
@@ -329,12 +353,12 @@
visible, 0;
rel1 {
relative, 0.0 0.0;
- offset, 2 16;
+ offset, 2 20;
to, "eapp_info";
}
rel2 {
relative, 1.0 0.0;
- offset, 2 28;
+ offset, 2 32;
to, "eapp_info";
}
text {
@@ -372,12 +396,13 @@
}
part {
name, "button_bar";
- type, SWALLOW;
+ type, RECT;
description {
state, "default" 0.0;
+ color, 0 0 0 0;
rel1 {
relative, 0.0 0.0;
- offset, 0 0;
+ offset, 5 0;
to, "button_bar_body";
}
rel2 {
@@ -397,15 +422,15 @@
state, "default" 0.0;
rel1 {
relative, 0.0 0.0;
- offset, 1 0;
+ offset, 4 4;
to, "menu_base";
}
rel2 {
relative, 1.0 1.0;
- offset, -2 -2;
+ offset, -4 -4;
to, "menu_base";
}
- color, 221 221 221 225;
+ color, 221 221 221 0;
}
}
part {
@@ -425,13 +450,27 @@
to_y, "eapps_bar_body";
}
image {
- normal, "e17_menu_bg.png";
- }
- fill {
- smooth: 0;
+ 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;
@@ -460,20 +499,20 @@
part {
name, "menu_items";
mouse_events, 0;
- type, SWALLOW;
+ type, RECT;
description {
state, "default" 0.0;
rel1 {
relative, 0.0 0.0;
- offset, 1 1;
+ offset, 13 13;
to, "menu_base";
}
rel2 {
relative, 1.0 1.0;
- offset, -1 -1;
+ offset, -13 -13;
to, "menu_base";
}
- color, 0 0 0 255;
+ color, 0 0 0 0;
}
}
@@ -485,7 +524,7 @@
state, "default" 0.0;
rel1 {
relative, 1.0 1.0;
- offset, 120 0;
+ offset, 125 0;
to, "eapps_bar_body";
}
rel2 {
@@ -573,6 +612,7 @@
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;
@@ -583,6 +623,7 @@
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;
@@ -609,7 +650,7 @@
}
}
-#include "button.edc"
+#include "menu_item.edc"
part {
name, "arrow";
@@ -685,7 +726,7 @@
signal, "mouse,down,3";
action, SIGNAL_EMIT "move,start" "*";
}
-#include "button_progs.edc"
+#include "menu_item_progs.edc"
}
}
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
