Enlightenment CVS committal
Author : onefang
Project : e_modules
Module : emu
Dir : e_modules/emu/src/modules/emu
Modified Files:
module_edje.edc module_face.edc module_icon.edc
Log Message:
Don't go running indent on .edc files, it's bad for their health.
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/emu/src/modules/emu/module_edje.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- module_edje.edc 1 Mar 2006 15:59:47 -0000 1.2
+++ module_edje.edc 1 Mar 2006 17:31:19 -0000 1.3
@@ -1,18 +1,15 @@
-images
-{
- image:"emu1.png" COMP;
- image:"FancyEgg.png" COMP;
- image:"e17_titlebar.png" COMP;
+images {
+ image: "emu1.png" COMP;
+ image: "FancyEgg.png" COMP;
+ image: "e17_titlebar.png" COMP;
}
-fonts
-{
- font:"Vera.ttf" "Edje-Vera";
- font:"VeraBd.ttf" "Edje-Vera-Bold";
+fonts {
+ font: "Vera.ttf" "Edje-Vera";
+ font: "VeraBd.ttf" "Edje-Vera-Bold";
}
-collections
-{
+collections {
#include "module_icon.edc"
#include "module_face.edc"
}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/emu/src/modules/emu/module_face.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- module_face.edc 1 Mar 2006 15:59:47 -0000 1.2
+++ module_face.edc 1 Mar 2006 17:31:19 -0000 1.3
@@ -1,312 +1,264 @@
-group
-{
- name:"emu/main";
- max:304 304;
- script
- {
+group {
+ name: "emu/main";
+ max: 304 304;
+ script {
public is_active;
public is_hilited;
}
- parts
- {
- part
- {
- name:"title_bar";
- mouse_events:0;
- description
- {
- state:"default" 0.0;
- visible:0;
- image
- {
- normal:"e17_titlebar.png";
- border:8 8 8 8;
- }
- color:255 255 255 0;
- }
- description
- {
- state:"active" 0.0;
- visible:1;
- image
- {
- normal:"e17_titlebar.png";
- border:8 8 8 8;
- }
- color:255 255 255 255;
- }
- }
-
- part
- {
- name:"logo";
- description
- {
- state:"default" 0.0;
- aspect:1.0 1.0;
- rel1
- {
- to:"title_bar";
- offset:60 60;
- }
- rel2
- {
- to:"title_bar";
- offset:-61 - 61;
- }
- image
- {
- normal:"FancyEgg.png";
- }
- color:255 255 255 0;
- }
- description
- {
- state:"active" 0.0;
- inherit:"default" 0.0;
- rel1
- {
- to:"title_bar";
- offset:0 0;
- }
- rel2
- {
- to:"title_bar";
- offset:-1 - 1;
- }
- color:255 255 255 255;
- }
- }
-
- part
- {
- name:"logo2";
- description
- {
- state:"default" 0.0;
- aspect:1.0 1.0;
- rel1
- {
- to:"title_bar";
- offset:0 0;
- }
- rel2
- {
- to:"title_bar";
- offset:-1 - 1;
- }
- image
- {
- normal:"emu1.png";
- }
- }
- description
- {
- state:"active" 0.0;
- inherit:"default" 0.0;
- rel1
- {
- to:"title_bar";
- offset:14 20;
- }
- rel2
- {
- to:"title_bar";
- offset:-14 - 8;
- }
- }
- }
-
- part
- {
- name:"inout";
- type:RECT;
- mouse_events:1;
- description
- {
- state:"default" 0.0;
- color:255 255 255 0;
- }
+ parts {
+ part {
+ name: "title_bar";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ image {
+ normal: "e17_titlebar.png";
+ border: 8 8 8 8;
+ }
+ color: 255 255 255 0;
+ }
+ description {
+ state: "active" 0.0;
+ visible: 1;
+ image {
+ normal: "e17_titlebar.png";
+ border: 8 8 8 8;
+ }
+ color: 255 255 255 255;
+ }
+ }
+
+ part {
+ name: "logo";
+ description {
+ state: "default" 0.0;
+ aspect: 1.0 1.0;
+ rel1 {
+ to: "title_bar";
+ offset: 60 60;
+ }
+ rel2 {
+ to: "title_bar";
+ offset: -61 -61;
+ }
+ image {
+ normal: "FancyEgg.png";
+ }
+ color: 255 255 255 0;
+ }
+ description {
+ state: "active" 0.0;
+ inherit: "default" 0.0;
+ rel1 {
+ to: "title_bar";
+ offset: 0 0;
+ }
+ rel2 {
+ to: "title_bar";
+ offset: -1 -1;
+ }
+ color: 255 255 255 255;
+ }
+ }
+
+ part {
+ name: "logo2";
+ description {
+ state: "default" 0.0;
+ aspect: 1.0 1.0;
+ rel1 {
+ to: "title_bar";
+ offset: 0 0;
+ }
+ rel2 {
+ to: "title_bar";
+ offset: -1 -1;
+ }
+ image {
+ normal: "emu1.png";
+ }
+ }
+ description {
+ state: "active" 0.0;
+ inherit: "default" 0.0;
+ rel1 {
+ to: "title_bar";
+ offset: 14 20;
+ }
+ rel2 {
+ to: "title_bar";
+ offset: -14 -8;
+ }
+ }
+ }
+
+ part {
+ name: "inout";
+ type: RECT;
+ mouse_events: 1;
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 0;
+ }
}
}
- programs
- {
- program
- {
- name:"init";
- signal:"load";
- source:"";
- script
- {
- set_int(is_active, 0);
- set_int(is_hilited, 0);
- }
- }
- program
- {
- name:"mouse_in";
- signal:"mouse,in";
- source:"inout";
- script
- {
- new val;
-
- val = get_int(is_active);
- if (val == 0)
- {
- run_program(PROGRAM:"go_active_pre");
- set_int(is_hilited, 1);
- }
- }
- }
- program
- {
- name:"mouse_out";
- signal:"mouse,out";
- source:"inout";
- script
- {
- new val;
-
- val = get_int(is_active);
- if (val == 0)
- {
- run_program(PROGRAM:"go_passive_pre");
- set_int(is_hilited, 0);
- }
- }
- }
- program
- {
- name:"handle_active";
- signal:"active";
- source:"";
- script
- {
- new val;
-
- set_int(is_active, 1);
- val = get_int(is_hilited);
- if (val == 0)
- run_program(PROGRAM:"go_active_pre");
- run_program(PROGRAM:"logo_go_active");
- }
- }
- program
- {
- name:"handle_passive";
- signal:"passive";
- source:"";
- script
- {
- new val;
-
- set_int(is_active, 0);
- val = get_int(is_hilited);
- if (val == 1)
- {
- run_program(PROGRAM:"go_passive_pre");
- set_int(is_hilited, 0);
- }
- run_program(PROGRAM:"logo_go_passive");
- }
- }
-
- program
- {
- name:"go_active_pre";
- signal:"";
- source:"";
- action:STATE_SET "default" 0.0;
- target:"logo2";
- after:"go_active";
- }
- program
- {
- name:"go_active";
- action:STATE_SET "active" 0.0;
- target:"logo2";
- target:"logo";
- transition:LINEAR 0.2;
- }
-
- program
- {
- name:"logo_go_active";
- signal:"";
- source:"";
- after:"hover_go_active";
- }
- program
- {
- name:"hover_go_active";
- signal:"";
- source:"";
- action:STATE_SET "visible" 0.0;
- target:"logo2";
- after:"hover_go_active2";
- }
- program
- {
- name:"hover_go_active2";
- signal:"";
- source:"";
- action:STATE_SET "hidden" 0.0;
- transition:LINEAR 0.5;
- target:"logo2";
- after:"hover_go_active";
- }
-
- program
- {
- name:"go_passive_pre";
- signal:"";
- source:"";
- action:STATE_SET "active" 0.0;
- target:"logo2";
- after:"go_passive";
- }
- program
- {
- name:"go_passive";
- action:STATE_SET "default" 0.0;
- target:"logo";
- transition:LINEAR 0.2;
- after:"go_passive3";
- }
- program
- {
- name:"go_passive3";
- action:STATE_SET "default" 0.0;
- target:"logo2";
- transition:LINEAR 0.2;
- }
-
- program
- {
- name:"logo_go_passive";
- signal:"";
- source:"";
- after:"hover_go_passive";
- }
-
- program
- {
- name:"hover_go_passive";
- signal:"";
- source:"";
- action:ACTION_STOP;
- target:"hover_go_active";
- target:"hover_go_active2";
- after:"hover_go_passive2";
- }
- program
- {
- name:"hover_go_passive2";
- signal:"";
- source:"";
- action:STATE_SET "default" 0.0;
- target:"logo2";
+ programs {
+ program {
+ name: "init";
+ signal: "load";
+ source: "";
+ script {
+ set_int(is_active, 0);
+ set_int(is_hilited, 0);
+ }
+ }
+ program {
+ name: "mouse_in";
+ signal: "mouse,in";
+ source: "inout";
+ script {
+ new val;
+
+ val = get_int(is_active);
+ if (val == 0)
+ {
+ run_program(PROGRAM:"go_active_pre");
+ set_int(is_hilited, 1);
+ }
+ }
+ }
+ program {
+ name: "mouse_out";
+ signal: "mouse,out";
+ source: "inout";
+ script {
+ new val;
+
+ val = get_int(is_active);
+ if (val == 0)
+ {
+ run_program(PROGRAM:"go_passive_pre");
+ set_int(is_hilited, 0);
+ }
+ }
+ }
+ program {
+ name: "handle_active";
+ signal: "active";
+ source: "";
+ script {
+ new val;
+
+ set_int(is_active, 1);
+ val = get_int(is_hilited);
+ if (val == 0)
+ run_program(PROGRAM:"go_active_pre");
+ run_program(PROGRAM:"logo_go_active");
+ }
+ }
+ program {
+ name: "handle_passive";
+ signal: "passive";
+ source: "";
+ script {
+ new val;
+
+ set_int(is_active, 0);
+ val = get_int(is_hilited);
+ if (val == 1)
+ {
+ run_program(PROGRAM:"go_passive_pre");
+ set_int(is_hilited, 0);
+ }
+ run_program(PROGRAM:"logo_go_passive");
+ }
+ }
+
+ program {
+ name: "go_active_pre";
+ signal: "";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "logo2";
+ after: "go_active";
+ }
+ program {
+ name: "go_active";
+ action: STATE_SET "active" 0.0;
+ target: "logo2";
+ target: "logo";
+ transition: LINEAR 0.2;
+ }
+
+ program {
+ name: "logo_go_active";
+ signal: "";
+ source: "";
+ after: "hover_go_active";
+ }
+ program {
+ name: "hover_go_active";
+ signal: "";
+ source: "";
+ action: STATE_SET "visible" 0.0;
+ target: "logo2";
+ after: "hover_go_active2";
+ }
+ program {
+ name: "hover_go_active2";
+ signal: "";
+ source: "";
+ action: STATE_SET "hidden" 0.0;
+ transition: LINEAR 0.5;
+ target: "logo2";
+ after: "hover_go_active";
+ }
+
+ program {
+ name: "go_passive_pre";
+ signal: "";
+ source: "";
+ action: STATE_SET "active" 0.0;
+ target: "logo2";
+ after: "go_passive";
+ }
+ program {
+ name: "go_passive";
+ action: STATE_SET "default" 0.0;
+ target: "logo";
+ transition: LINEAR 0.2;
+ after: "go_passive3";
+ }
+ program {
+ name: "go_passive3";
+ action: STATE_SET "default" 0.0;
+ target: "logo2";
+ transition: LINEAR 0.2;
+ }
+
+ program {
+ name: "logo_go_passive";
+ signal: "";
+ source: "";
+ after: "hover_go_passive";
+ }
+
+ program {
+ name: "hover_go_passive";
+ signal: "";
+ source: "";
+ action: ACTION_STOP;
+ target: "hover_go_active";
+ target: "hover_go_active2";
+ after: "hover_go_passive2";
+ }
+ program {
+ name: "hover_go_passive2";
+ signal: "";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "logo2";
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/emu/src/modules/emu/module_icon.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- module_icon.edc 1 Mar 2006 15:59:47 -0000 1.2
+++ module_icon.edc 1 Mar 2006 17:31:19 -0000 1.3
@@ -1,276 +1,232 @@
-group
-{
- name:"icon";
- max:304 304;
- script
- {
+group {
+ name: "icon";
+ max: 304 304;
+ script {
public is_active;
public is_hilited;
}
- parts
- {
- part
- {
- name:"title_bar";
- mouse_events:0;
- description
- {
- state:"default" 0.0;
- visible:0;
- image
- {
- normal:"e17_titlebar.png";
- border:8 8 8 8;
- }
- color:255 255 255 0;
- }
- description
- {
- state:"active" 0.0;
- visible:1;
- image
- {
- normal:"e17_titlebar.png";
- border:8 8 8 8;
- }
- color:255 255 255 255;
- }
- }
-
- part
- {
- name:"logo";
- description
- {
- state:"default" 0.0;
- aspect:1.0 1.0;
- rel1
- {
- to:"title_bar";
- offset:60 60;
- }
- rel2
- {
- to:"title_bar";
- offset:-61 - 61;
- }
- image
- {
- normal:"FancyEgg.png";
- }
- color:255 255 255 0;
- }
- description
- {
- state:"active" 0.0;
- inherit:"default" 0.0;
- rel1
- {
- to:"title_bar";
- offset:0 0;
- }
- rel2
- {
- to:"title_bar";
- offset:-1 - 1;
- }
- color:255 255 255 255;
- }
- }
-
- part
- {
- name:"logo2";
- description
- {
- state:"default" 0.0;
- aspect:1.0 1.0;
- rel1
- {
- to:"title_bar";
- offset:0 0;
- }
- rel2
- {
- to:"title_bar";
- offset:-1 - 1;
- }
- image
- {
- normal:"emu1.png";
- }
- }
- description
- {
- state:"active" 0.0;
- inherit:"default" 0.0;
- rel1
- {
- to:"title_bar";
- offset:14 20;
- }
- rel2
- {
- to:"title_bar";
- offset:-14 - 8;
- }
- }
- }
-
- part
- {
- name:"inout";
- type:RECT;
- mouse_events:1;
- description
- {
- state:"default" 0.0;
- color:255 255 255 0;
- }
+ parts {
+ part {
+ name: "title_bar";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ image {
+ normal: "e17_titlebar.png";
+ border: 8 8 8 8;
+ }
+ color: 255 255 255 0;
+ }
+ description {
+ state: "active" 0.0;
+ visible: 1;
+ image {
+ normal: "e17_titlebar.png";
+ border: 8 8 8 8;
+ }
+ color: 255 255 255 255;
+ }
+ }
+
+ part {
+ name: "logo";
+ description {
+ state: "default" 0.0;
+ aspect: 1.0 1.0;
+ rel1 {
+ to: "title_bar";
+ offset: 60 60;
+ }
+ rel2 {
+ to: "title_bar";
+ offset: -61 -61;
+ }
+ image {
+ normal: "FancyEgg.png";
+ }
+ color: 255 255 255 0;
+ }
+ description {
+ state: "active" 0.0;
+ inherit: "default" 0.0;
+ rel1 {
+ to: "title_bar";
+ offset: 0 0;
+ }
+ rel2 {
+ to: "title_bar";
+ offset: -1 -1;
+ }
+ color: 255 255 255 255;
+ }
+ }
+
+ part {
+ name: "logo2";
+ description {
+ state: "default" 0.0;
+ aspect: 1.0 1.0;
+ rel1 {
+ to: "title_bar";
+ offset: 0 0;
+ }
+ rel2 {
+ to: "title_bar";
+ offset: -1 -1;
+ }
+ image {
+ normal: "emu1.png";
+ }
+ }
+ description {
+ state: "active" 0.0;
+ inherit: "default" 0.0;
+ rel1 {
+ to: "title_bar";
+ offset: 14 20;
+ }
+ rel2 {
+ to: "title_bar";
+ offset: -14 -8;
+ }
+ }
+ }
+
+ part {
+ name: "inout";
+ type: RECT;
+ mouse_events: 1;
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 0;
+ }
}
}
- programs
- {
- program
- {
- name:"init";
- signal:"load";
- source:"";
- script
- {
- set_int(is_active, 0);
- set_int(is_hilited, 0);
- }
- }
- program
- {
- name:"mouse_in";
- signal:"active";
- source:"";
- script
- {
- new val;
-
- val = get_int(is_active);
- if (val == 0)
- {
- run_program(PROGRAM:"go_active_pre");
- set_int(is_hilited, 1);
- }
- }
- }
- program
- {
- name:"mouse_out";
- signal:"passive";
- source:"";
- script
- {
- new val;
-
- val = get_int(is_active);
- if (val == 0)
- {
- run_program(PROGRAM:"go_passive_pre");
- set_int(is_hilited, 0);
- }
- }
- }
- program
- {
- name:"go_active_pre";
- signal:"";
- source:"";
- action:STATE_SET "default" 0.0;
- target:"logo2";
- after:"go_active";
- }
- program
- {
- name:"go_active";
- action:STATE_SET "active" 0.0;
- target:"logo2";
- target:"logo";
- transition:LINEAR 0.2;
- }
-
- program
- {
- name:"logo_go_active";
- signal:"";
- source:"";
- after:"hover_go_active";
- }
- program
- {
- name:"hover_go_active";
- signal:"";
- source:"";
- action:STATE_SET "visible" 0.0;
- target:"logo2";
- after:"hover_go_active2";
- }
- program
- {
- name:"hover_go_active2";
- signal:"";
- source:"";
- action:STATE_SET "hidden" 0.0;
- transition:LINEAR 0.5;
- target:"logo2";
- after:"hover_go_active";
- }
-
- program
- {
- name:"go_passive_pre";
- signal:"";
- source:"";
- action:STATE_SET "active" 0.0;
- target:"logo2";
- after:"go_passive";
- }
- program
- {
- name:"go_passive";
- action:STATE_SET "default" 0.0;
- target:"logo";
- transition:LINEAR 0.2;
- after:"go_passive3";
- }
- program
- {
- name:"go_passive3";
- action:STATE_SET "default" 0.0;
- target:"logo2";
- transition:LINEAR 0.2;
- }
-
- program
- {
- name:"logo_go_passive";
- signal:"";
- source:"";
- after:"hover_go_passive";
- }
-
- program
- {
- name:"hover_go_passive";
- signal:"";
- source:"";
- action:ACTION_STOP;
- target:"hover_go_active";
- target:"hover_go_active2";
- after:"hover_go_passive2";
- }
- program
- {
- name:"hover_go_passive2";
- signal:"";
- source:"";
- action:STATE_SET "default" 0.0;
- target:"logo2";
+ programs {
+ program {
+ name: "init";
+ signal: "load";
+ source: "";
+ script {
+ set_int(is_active, 0);
+ set_int(is_hilited, 0);
+ }
+ }
+ program {
+ name: "mouse_in";
+ signal: "active";
+ source: "";
+ script {
+ new val;
+
+ val = get_int(is_active);
+ if (val == 0)
+ {
+ run_program(PROGRAM:"go_active_pre");
+ set_int(is_hilited, 1);
+ }
+ }
+ }
+ program {
+ name: "mouse_out";
+ signal: "passive";
+ source: "";
+ script {
+ new val;
+
+ val = get_int(is_active);
+ if (val == 0)
+ {
+ run_program(PROGRAM:"go_passive_pre");
+ set_int(is_hilited, 0);
+ }
+ }
+ }
+ program {
+ name: "go_active_pre";
+ signal: "";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "logo2";
+ after: "go_active";
+ }
+ program {
+ name: "go_active";
+ action: STATE_SET "active" 0.0;
+ target: "logo2";
+ target: "logo";
+ transition: LINEAR 0.2;
+ }
+
+ program {
+ name: "logo_go_active";
+ signal: "";
+ source: "";
+ after: "hover_go_active";
+ }
+ program {
+ name: "hover_go_active";
+ signal: "";
+ source: "";
+ action: STATE_SET "visible" 0.0;
+ target: "logo2";
+ after: "hover_go_active2";
+ }
+ program {
+ name: "hover_go_active2";
+ signal: "";
+ source: "";
+ action: STATE_SET "hidden" 0.0;
+ transition: LINEAR 0.5;
+ target: "logo2";
+ after: "hover_go_active";
+ }
+
+ program {
+ name: "go_passive_pre";
+ signal: "";
+ source: "";
+ action: STATE_SET "active" 0.0;
+ target: "logo2";
+ after: "go_passive";
+ }
+ program {
+ name: "go_passive";
+ action: STATE_SET "default" 0.0;
+ target: "logo";
+ transition: LINEAR 0.2;
+ after: "go_passive3";
+ }
+ program {
+ name: "go_passive3";
+ action: STATE_SET "default" 0.0;
+ target: "logo2";
+ transition: LINEAR 0.2;
+ }
+
+ program {
+ name: "logo_go_passive";
+ signal: "";
+ source: "";
+ after: "hover_go_passive";
+ }
+
+ program {
+ name: "hover_go_passive";
+ signal: "";
+ source: "";
+ action: ACTION_STOP;
+ target: "hover_go_active";
+ target: "hover_go_active2";
+ after: "hover_go_passive2";
+ }
+ program {
+ name: "hover_go_passive2";
+ signal: "";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "logo2";
}
}
}
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
