From b28fbb9434c13588237220ceb8a0176b2452d85e Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 16 Jan 2004 00:59:02 +0000 Subject: [PATCH] examples change - test shwos 1 delimiter form, e_logo.edc, another SVN revision: 8448 --- legacy/edje/data/src/e_logo.edc | 6 +- legacy/edje/data/src/test.edc | 194 ++++++++++++++++---------------- 2 files changed, 100 insertions(+), 100 deletions(-) diff --git a/legacy/edje/data/src/e_logo.edc b/legacy/edje/data/src/e_logo.edc index f5dfcbb981..4dc917a162 100644 --- a/legacy/edje/data/src/e_logo.edc +++ b/legacy/edje/data/src/e_logo.edc @@ -431,7 +431,7 @@ collections { // signal, "*"; // source, "*"; action, STATE_SET "clicked" 0.0; - transition, LINEAR, 0.0; + transition, LINEAR 0.0; target, "logo"; } program { @@ -439,7 +439,7 @@ collections { signal, "mouse,up,1"; source, "logo"; action, STATE_SET "default" 0.0; - transition, DECELERATE, 0.25; + transition, DECELERATE 0.25; target, "logo"; } program { @@ -447,7 +447,7 @@ collections { signal, "show"; source, ""; action, STATE_SET "default" 0.0; - transition, LINEAR, 4.0; + transition, LINEAR 4.0; target, "logo_anim"; after, "logo_animate"; // at end... loop } diff --git a/legacy/edje/data/src/test.edc b/legacy/edje/data/src/test.edc index 5415171933..4297f27445 100644 --- a/legacy/edje/data/src/test.edc +++ b/legacy/edje/data/src/test.edc @@ -6,160 +6,160 @@ images // COMP = compressed, no loss // RAW = uncompressed, no loss // LOSSY = compressed with quality loss, next param is quality level (0-100) - image, "bg.png" LOSSY 80; /* raw pixels */ - image, "e.png" COMP; /* compressed */ + image: "bg.png" LOSSY 80; /* raw pixels */ + image: "e.png" COMP; /* compressed */ } // data can be attached to the edje file as a whole. string key, value style data { item: "Key" "This is a"" continued string"; - item, "My Data" "The string to attach to this data"; - item, "The Key" "String data attached to the key"; + item: "My Data" "The string to attach to this data"; + item: "The Key" "String data attached to the key"; } collections { group { - name, "test"; -// min, 0 0; -// max, 0 0; + name: "test"; +// min: 0 0; +// max: 0 0; // more data that can be attached per collection data { - item, "My Data" "The string to attach to this data"; - item, "The Key" "String data attached to the key"; + item: "My Data" "The string to attach to this data"; + item: "The Key" "String data attached to the key"; } parts { part { - name, "background"; + name: "background"; // IMAGE, RECT, TEXT -// type, IMAGE; +// type: IMAGE; // for text only really // NONE, PLAIN, OUTLINE, SOFT_OUTLINE, SHADOW, SOFT_SHADOW, OUTLINE_SHADOW, // OUTLINE_SOFT_SHADOW -// effect, NONE; - mouse_events, 0; -// repeat_events, 0; -// clip_to, "p1"; -// color_class, "default"; -// text_class, "default"; +// effect: NONE; + mouse_events: 0; +// repeat_events: 0; +// clip_to: "p1"; +// color_class: "default"; +// text_class: "default"; // dragable // { // direction, on/off stepping count -// x, 0 1 2; -// y, 0 1 2; -// confine, "p2"; +// x: 0 1 2; +// y: 0 1 2; +// confine: "p2"; // } description { // state, "name" (float value 0.0 - 1.0) - state, "default" 0.0; - visible, 1; -// align, 0.5 0.5; -// min, 0 0; -// max, 0 0; -// step, 1 1; -// aspect, 0.0 999999.0; + state: "default" 0.0; + visible: 1; +// align: 0.5 0.5; +// min: 0 0; +// max: 0 0; +// step: 1 1; +// aspect: 0.0 999999.0; rel1 { - relative, 0.0 0.0; - offset, 0 0; + relative: 0.0 0.0; + offset: 0 0; // if not defined assumed to be -1 (relative to all). to alone implies x & y -// to, "p2"; +// to: "p2"; // relative to thia named part only in X direction -// to_x, "p2"; +// to_x: "p2"; // and relative to this part only in the y direction -// to_y, "p2"; +// to_y: "p2"; } rel2 { - relative, 1.0 1.0; - offset, -1 -1; + relative: 1.0 1.0; + offset: -1 -1; } image { - normal, "bg.png"; + normal: "bg.png"; // tween images are images that are looped thru when graduating TO normal -// tween, "test2.png"; -// tween, "test3.png"; +// tween: "test2.png"; +// tween: "test3.png"; } - border, 12 12 12 12; + border: 12 12 12 12; // fill // { -// smooth, 1; +// smooth: 1; // origin // { -// relative, 0.0 0.0; -// offset, 0 0; +// relative: 0.0 0.0; +// offset: 0 0; // } // size // { -// relative, 1.0 1.0; -// offset, 0 0; +// relative: 1.0 1.0; +// offset: 0 0; // } // } // only useful if its a rect or text object -// color, 255 255 255 255; +// color: 255 255 255 255; // only useful if its a text object -// color2, 255 255 255 255; -// color3, 255 255 255 255; +// color2: 255 255 255 255; +// color3: 255 255 255 255; // text // { -// text, "test text"; -// font, "Vera"; -// size, 12; -// fit, 0 0; -// min, 1 1; -// align, 0.5 0.5; +// text: "test text"; +// font: "Vera"; +// size: 12; +// fit: 0 0; +// min: 1 1; +// align: 0.5 0.5; // } } } part { - name, "logo"; + name: "logo"; description { - state, "default" 0.0; - visible, 1; - max, 64 64; + state: "default" 0.0; + visible: 1; + max: 64 64; rel1 { - relative, 0.0 0.0; - offset, 16 16; + relative: 0.0 0.0; + offset: 16 16; } rel2 { - relative, 1.0 1.0; - offset, -17 -17; + relative: 1.0 1.0; + offset: -17 -17; } image { - normal, "e.png"; + normal: "e.png"; } } description { - state, "clicked" 0.0; - visible, 1; - align, 0.5 0.5; - max, 64 64; + state: "clicked" 0.0; + visible: 1; + align: 0.5 0.5; + max: 64 64; rel1 { - relative, 0.0 0.0; - offset, 16 16; + relative: 0.0 0.0; + offset: 16 16; } rel2 { - relative, 1.0 1.0; - offset, -17 -17; + relative: 1.0 1.0; + offset: -17 -17; } image { - normal, "e.png"; + normal: "e.png"; } } } @@ -168,44 +168,44 @@ collections { program { - name, "logo_click"; - signal, "mouse,down,1"; - source, "logo"; + name: "logo_click"; + signal: "mouse,down,1"; + source: "logo"; // STATE_SET, ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, DRAG_VAL_STEP, DRAG_VAL_PAGE - action, STATE_SET "clicked" 0.0; + action: STATE_SET "clicked" 0.0; // LINEAR, SINUSOIDAL, ACCELERATE, DECELERATE, + seconds to transition over -// transition, LINEAR 0.0; +// transition: LINEAR 0.0; // who to apply this state to, can be multiple targets - target, "logo"; -// after, "p1_fade_1"; + target: "logo"; +// after: "p1_fade_1"; } program { - name, "logo_unclick"; - signal, "mouse,up,1"; - source, "logo"; - action, STATE_SET "default" 0.0; - target, "logo"; + name: "logo_unclick"; + signal: "mouse,up,1"; + source: "logo"; + action: STATE_SET "default" 0.0; + target: "logo"; } /* program { - name, "p1_fade_2"; - signal, "action,end"; - source, "p1_fade_1"; - action, STATE_SET "clicked" 0.0; - transition, LINEAR 1.0; - target, "p1"; - after, "p1_fade_1"; + name: "p1_fade_2"; + signal: "action,end"; + source: "p1_fade_1"; + action: STATE_SET "clicked" 0.0; + transition: LINEAR 1.0; + target: "p1"; + after: "p1_fade_1"; } program { - name, "p1_unclicked"; - signal, "mouse,up,1"; - source, "p1"; - action, STATE_SET "default" 0.0; - transition, LINEAR 0.0; - target, "p1"; + name: "p1_unclicked"; + signal: "mouse,up,1"; + source: "p1"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.0; + target: "p1"; } */ } @@ -213,12 +213,12 @@ collections /* group { - name, "test2"; + name: "test2"; parts { part { - name, "p1"; + name: "p1"; } } programs