[detour commit] r695 - in branches/e17: bits images

0 views

Skip to first unread message

codesite...@google.com

unread,

Feb 1, 2009, 2:26:28 AM2/1/09

to detour-the...@googlegroups.com

Author: alberto.castro.leiva
Date: Sat Jan 31 21:40:37 2009
New Revision: 695

Modified:
branches/e17/bits/background.edc
branches/e17/bits/fileman.edc
branches/e17/images/logo_im1.png

Log:
No need for all this embryo scripts if we can't get the desired
effect. Maybe my logic was just way way off.

Modified: branches/e17/bits/background.edc
==============================================================================
--- branches/e17/bits/background.edc (original)
+++ branches/e17/bits/background.edc Sat Jan 31 21:40:37 2009
@@ -63,12 +63,11 @@
name: "logo";
type: IMAGE;
mouse_events: 0;
- clip_to: "logo_clip";

description {
state: "default" 0.0;
- min: 20 20;
- max: 20 20;
+ min: 40 44;
+ max: 40 44;
fixed: 1 1;
image.normal: "images/logo_im1.png";
align: 0.0 0.0;
@@ -76,7 +75,7 @@
rel1 {
to: "gradient";
relative: 0.0 0.0;
- offset: 26 26;
+ offset: -40 15;
}

rel2 {
@@ -85,34 +84,44 @@
offset: -1 -1;
}
}
- }
-
- part {
- name: "logo_clip";
- type: RECT;
- mouse_events: 0;
-
- description {
- state: "default" 0.0;
- color: 255 255 255 255;
- }

description {
- state: "hidden" 0.0;
+ state: "visible" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 0;
+
+ rel1 {
+ to: "gradient";
+ relative: 0.0 0.0;
+ offset: 0 15;
+ }
+
+ rel2 {
+ to: "gradient";
+ relative: 0.0 0.0;
+ offset: -1 -1;
+ }
}
}
}

programs {
program {
- name: "hide_logo";
+ name: "show_logo";
signal: "show";
source: "";
- action: STATE_SET "hidden" 0.0;
+ action: STATE_SET "visible" 0.0;
+ transition: LINEAR 0.25;
+ target: "logo"; in: 10.0 0.0;
+ after: "hide_logo";
+ }
+
+ program {
+ name: "hide_logo";
+ signal: "";
+ source: "";
+ action: STATE_SET "default" 0.0;
transition: LINEAR 0.25;
- target: "logo_clip"; in: 5.0 0.0;
+ target: "logo"; in: 10.0 0.0;
}
}
}

Modified: branches/e17/bits/fileman.edc
==============================================================================
--- branches/e17/bits/fileman.edc (original)
+++ branches/e17/bits/fileman.edc Sat Jan 31 21:40:37 2009
@@ -2690,11 +2690,6 @@
group {
name: "e/fileman/default/icon/variable";

- script {
- public hilited;
- public selected;
- }
-
parts {
part {
name: "icon_box_shadow";
@@ -3023,8 +3018,8 @@
state: "default" 0.0;
align: 0.5 1.0;
fixed: 0 1;
- color: 7 7 7 221;
- color3: 7 7 7 0;
+ color: 7 7 7 255;
+ color3: 7 7 7 16;

rel1 {
relative: 0.0 1.0;
@@ -3069,8 +3064,6 @@
description {
state: "selected" 0.0;
inherit: "default" 0.0;
- color: 7 7 7 221;
- color3: 7 7 7 32;
}

description {
@@ -3146,132 +3139,40 @@
name: "event_in";
signal: "mouse,in";
source: "event";
- script {
- set_int(hilited, 1);
- }
+ action: STATE_SET "hover" 0.0;
+ target: "e.swallow.icon_clip";
+ target: "e.text.label";
}

program {
name: "event_out";
signal: "mouse,out";
source: "event";
- script {
- set_int(hilited, 0);
- }
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.25;
+ target: "e.swallow.icon_clip";
+ target: "e.text.label";
}

program {
name: "event_selected";
signal: "e,state,selected";
source: "e";
- script {
- set_int(selected, 1);
- if(get_int(hilited) == 0)
- {
- set_int(hilited, 1);
- }
- emit("label_selected", "");
- }
+ action: STATE_SET "selected" 0.0;
+ target: "e.swallow.icon_clip";
+ target: "e.text.label";
+ target: "filename_overlay_clip";
}

program {
name: "event_unselected";
signal: "e,state,unselected";
source: "e";
- script {
- set_int(selected, 0);
- if(get_int(hilited) == 1)
- {
- set_int(hilited, 0);
- }
- emit("label_unselected", "");
- }
- }
-
- program {
- name: "label_selected";
- signal: "label_selected";
- source: "";
- script {
- set_state(PART:"e.swallow.icon_clip", "selected", 0.0);
- set_state(PART:"e.text.label", "selected", 0.0);
- set_state(PART:"filename_overlay_clip", "selected", 0.0);
- }
- }
-
- program {
- name: "icon_unselected";
- signal: "label_unselected";
- source: "";
- script {
- set_state(PART:"e.swallow.icon_clip", "default", 0.0);
- set_state(PART:"e.text.label", "default", 0.0);
- set_state(PART:"filename_overlay_clip", "default", 0.0);
- }
- }
-
- program {
- name: "label_active";
- signal: "mouse,in";
- source: "event";
- script {
- if(get_int(hilited) == 0)
- {
- set_int(hilited, 1);
- set_state(PART:"e.swallow.icon_clip", "hover", 0.0);
- set_state(PART:"e.text.label", "hover", 0.0);
- //set_state(PART:"filename_overlay_clip", "hover", 0.0);
- }
-
- if(get_int(hilited) == 1)
- {
- set_state(PART:"e.swallow.icon_clip", "hover", 0.0);
- set_state(PART:"e.text.label", "hover", 0.0);
- //set_state(PART:"filename_overlay_clip", "hover", 0.0);
- }
-
- if(get_int(selected) == 1)
- {
- set_state(PART:"e.swallow.icon_clip", "hover", 0.0);
- set_state(PART:"e.text.label", "hover", 0.0);
- //set_state(PART:"filename_overlay_clip", "hover", 0.0);
- }
- }
- }
-
- program {
- name: "label_inactive";
- signal: "mouse,out";
- source: "event";
- script {
- if(get_int(hilited) == 1)
- {
- set_int(hilited, 0);
- set_state(PART:"e.swallow.icon_clip", "default", 0.0);
- set_state(PART:"e.text.label", "default", 0.0);
- //set_state(PART:"filename_overlay_clip", "default", 0.0);
- }
-
- if(get_int(hilited) == 0)
- {
- set_state(PART:"e.swallow.icon_clip", "default", 0.0);
- set_state(PART:"e.text.label", "default", 0.0);
- //set_state(PART:"filename_overlay_clip", "default", 0.0);
- }
-
- if(get_int(selected) == 1)
- {
- set_state(PART:"e.swallow.icon_clip", "hover", 0.0);
- set_state(PART:"e.text.label", "hover", 0.0);
- //set_state(PART:"filename_overlay_clip", "hover", 0.0);
- }
-
- else {
- set_state(PART:"e.swallow.icon_clip", "default", 0.0);
- set_state(PART:"e.text.label", "default", 0.0);
- //set_state(PART:"filename_overlay_clip", "default", 0.0);
- }
- }
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.25;
+ target: "e.swallow.icon_clip";
+ target: "e.text.label";
+ target: "filename_overlay_clip";
}

program {
@@ -3308,11 +3209,6 @@
group {
name: "e/fileman/desktop/icon/variable";

- script {
- public hilited;
- public selected;
- }
-
parts {
part {
name: "icon_box_shadow";
@@ -3765,132 +3661,40 @@
name: "event_in";
signal: "mouse,in";
source: "event";
- script {
- set_int(hilited, 1);
- }
+ action: STATE_SET "hover" 0.0;
+ target: "e.swallow.icon_clip";
+ target: "e.text.label";
}

program {

Modified: branches/e17/images/logo_im1.png
==============================================================================
Binary files. No diff available.

Reply all

Reply to author

Forward

0 new messages