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

1 view

Skip to first unread message

codesite...@google.com

unread,

Mar 5, 2009, 2:39:56 AM3/5/09

to detour-the...@googlegroups.com

Author: alberto.castro.leiva
Date: Wed Mar 4 23:39:05 2009
New Revision: 709

Modified:
branches/e17/bits/about_detour.edc
branches/e17/bits/border.edc
branches/e17/images/logo_im0.png
branches/e17/macros/border.edc
branches/e17/macros/border_programs.edc

Log:
Border button updates.

Modified: branches/e17/bits/about_detour.edc
==============================================================================
--- branches/e17/bits/about_detour.edc (original)
+++ branches/e17/bits/about_detour.edc Wed Mar 4 23:39:05 2009
@@ -365,8 +365,8 @@

description {
state: "default" 0.0;
- min: 83 83;
- max: 83 83;
+ min: 84 83;
+ max: 84 83;
fixed: 1 1;
align: 0.5 0.5;

@@ -396,7 +396,7 @@
description {
state: "default" 0.0;
color: 60 60 60 255;
- color3: 255 255 255 128;
+ color3: 255 255 255 192;
fixed: 1 1;

rel1 {
@@ -563,7 +563,7 @@

text {
style: "about_detour";
- text: "Detour is designed and developed by Alberto Castro
[<lighter>boykot tokyo</lighter>] with help from Hannes Janetzek
[<lighter>jeffdameth</lighter>], et al.<\n><\n>Detour is licensed under the
BSD Artistic License.<br><br>Enjoy! <-><subliminal>Tricks of the Guild.
[2003-2009]</subliminal>";
+ text: "detour is designed and developed by Alberto Castro
[<lighter>boykot tokyo</lighter>] with help from Hannes Janetzek
[<lighter>jeffdameth</lighter>], et al.<\n><\n>detour is licensed under the
BSD Artistic License.<br><br>Enjoy! <-><subliminal>Tricks of the Guild.
[2003-2009]</subliminal>";
}
}
}

Modified: branches/e17/bits/border.edc
==============================================================================
--- branches/e17/bits/border.edc (original)
+++ branches/e17/bits/border.edc Wed Mar 4 23:39:05 2009
@@ -117,6 +117,12 @@
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-max", "max-clip", 17
17, "max-clip", "images/window-border_bt3.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
+ BUTTON_SHADOW("button-close_shadow", "close-clip", 18
17, "close-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-max_shadow", "max-clip", 18
17, "max-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-min_shadow", "min-clip", 18
17, "min-clip", "images/button_im4.png")
+ BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-max_shadow_overlay", "max-clip", 20
18, "max-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.maximize", 1, "button-max")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")
@@ -224,6 +230,12 @@
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-max", "max-clip", 17
17, "max-clip", "images/window-border_bt3.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
+ BUTTON_SHADOW("button-close_shadow", "close-clip", 18
17, "close-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-max_shadow", "max-clip", 18
17, "max-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-min_shadow", "min-clip", 18
17, "min-clip", "images/button_im4.png")
+ BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-max_shadow_overlay", "max-clip", 20
18, "max-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.maximize", 1, "button-max")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")
@@ -353,6 +365,8 @@
CLIPS("close-clip", 20 18, 20 18, "top-right", 0.0 0.0, 0 0, 0.0 1.0,
-23 0)
HOLDER("_close", 20 18, "close-clip", "images/window-border_bt0.png")
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
+ BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
+ BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
RESIZE_TOP("resize_t", 1 2, 9999 2, "top-left", 0.0 0.0, 0
0, "top-right", 0.0 0.0, -1 0, 255 0 0 0)
E_SWALLOW_ICON("e.swallow.icon", "e.event.icon")
@@ -452,6 +466,8 @@
CLIPS("close-clip", 20 18, 20 18, "top-right", 0.0 0.0, 0 0, 0.0 1.0,
-23 0)
HOLDER("_close", 20 18, "close-clip", "images/window-border_bt0.png")
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
+ BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
+ BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
RESIZE_TOP("resize_t", 1 2, 9999 2, "top-left", 0.0 0.0, 0
0, "top-right", 0.0 0.0, -1 0, 255 0 0 0)
E_SWALLOW_ICON("e.swallow.icon", "e.event.icon")
@@ -466,7 +482,8 @@
source: "button-close";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "close-clip";
+ target: "button-close_shadow";
+ target: "button-close_shadow_overlay";
}

program {
@@ -475,7 +492,8 @@
source: "button-close";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "close-clip";
+ target: "button-close_shadow";
+ target: "button-close_shadow_overlay";
}
}
}
@@ -570,6 +588,10 @@
HOLDER("_close", 20 18, "close-clip", "images/window-border_bt0.png")
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
+ BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-min_shadow", "min-clip", 17
17, "min-clip", "images/button_im4.png")
+ BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")
RESIZE_TOP("resize_t", 1 2, 9999 2, "top-left", 0.0 0.0, 0
0, "top-right", 0.0 0.0, -1 0, 255 0 0 0)
@@ -585,7 +607,8 @@
source: "button-close";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "close-clip";
+ target: "button-close_shadow";
+ target: "button-close_shadow_overlay";
}

program {
@@ -594,7 +617,8 @@
source: "button-close";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "close-clip";
+ target: "button-close_shadow";
+ target: "button-close_shadow_overlay";
}

program {
@@ -603,7 +627,8 @@
source: "button-min";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "min-clip";
+ target: "button-min_shadow";
+ target: "button-min_shadow_overlay";
}

program {
@@ -612,7 +637,8 @@
source: "button-min";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "min-clip";
+ target: "button-min_shadow";
+ target: "button-min_shadow_overlay";
}
}
}
@@ -851,6 +877,12 @@
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-max", "max-clip", 17
17, "max-clip", "images/window-border_bt3.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
+ BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-max_shadow", "max-clip", 17
17, "max-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-min_shadow", "min-clip", 17
17, "min-clip", "images/button_im4.png")
+ BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-max_shadow_overlay", "max-clip", 20
18, "max-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.maximize", 1, "button-max")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")
@@ -868,6 +900,7 @@
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "inactive.shadow";
+ target: "e.text.title";
}

program {
@@ -877,33 +910,17 @@
action: STATE_SET "default" 0.1;
transition: DECELERATE 0.5;
target: "inactive.shadow";
- }
-
- program {
- name: "active.text";
- signal: "e,state,focused";
- source: "e";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
target: "e.text.title";
}

program {
- name: "inactive.text";
- signal: "e,state,unfocused";
- source: "e";
- action: STATE_SET "default" 0.1;
- transition: DECELERATE 0.5;
- target: "e.text.title";
- }
-
- program {
name: "close_click";
signal: "mouse,down,1";
source: "button-close";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "close-clip";
+ target: "button-close_shadow";
+ target: "button-close_shadow_overlay";
}

program {
@@ -912,7 +929,8 @@
source: "button-close";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "close-clip";
+ target: "button-close_shadow";
+ target: "button-close_shadow_overlay";
}

program {
@@ -921,7 +939,8 @@
source: "button-max";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "max-clip";
+ target: "button-max_shadow";
+ target: "button-max_shadow_overlay";
}

program {
@@ -930,7 +949,8 @@
source: "button-max";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "max-clip";
+ target: "button-max_shadow";
+ target: "button-max_shadow_overlay";
}

program {
@@ -939,7 +959,8 @@
source: "button-min";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "min-clip";
+ target: "button-min_shadow";
+ target: "button-min_shadow_overlay";
}

program {
@@ -948,7 +969,8 @@
source: "button-min";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "min-clip";
+ target: "button-min_shadow";
+ target: "button-min_shadow_overlay";
}
}
}
@@ -1093,6 +1115,12 @@
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-max", "max-clip", 17
17, "max-clip", "images/window-border_bt3.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
+ BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-max_shadow", "max-clip", 17
17, "max-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-min_shadow", "min-clip", 17
17, "min-clip", "images/button_im4.png")
+ BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-max_shadow_overlay", "max-clip", 20
18, "max-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.maximize", 1, "button-max")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")
@@ -1200,6 +1228,12 @@
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-max", "max-clip", 17
17, "max-clip", "images/window-border_bt3.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
+ BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-max_shadow", "max-clip", 17
17, "max-clip", "images/button_im4.png")
+ BUTTON_SHADOW("button-min_shadow", "min-clip", 17
17, "min-clip", "images/button_im4.png")
+ BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-max_shadow_overlay", "max-clip", 20
18, "max-clip", "images/button_im5.png")
+ BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.maximize", 1, "button-max")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")

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

Modified: branches/e17/macros/border.edc
==============================================================================
--- branches/e17/macros/border.edc (original)
+++ branches/e17/macros/border.edc Wed Mar 4 23:39:05 2009
@@ -286,12 +286,74 @@
normal: IMG; \
} \
} \
+}
+
+#define BUTTON_SHADOW(NAME, CLIP, SIZE, TO, IMG) \
+part { \
+ name: NAME; \
+ type: IMAGE; \
+ mouse_events: 0; \
+ clip_to: CLIP; \
\
description { \
- state: "default" 0.1; \
+ state: "default" 0.0; \
+ min: SIZE; \
+ max: SIZE; \
+ color: 255 255 255 0; \
+ \
+ rel1 { \
+ to: TO; \
+ } \
+ \
+ rel2 { \
+ to: TO; \
+ } \
+ \
+ image { \
+ normal: IMG; \
+ border: 6 6 7 0; \
+ } \
+ } \
+ \
+ description { \
+ state: "clicked" 0.0; \
inherit: "default" 0.0; \
- color: 215 215 215 192; \
+ color: 255 255 255 255; \
} \
+}
+
+#define BUTTON_SHADOW_OVERLAY(NAME, CLIP, SIZE, TO, IMG) \
+part { \
+ name: NAME; \
+ type: IMAGE; \
+ mouse_events: 0; \
+ clip_to: CLIP; \
+ \
+ description { \
+ state: "default" 0.0; \
+ min: SIZE; \
+ max: SIZE; \
+ color: 255 255 255 0; \
+ \
+ rel1 { \
+ to: TO; \
+ } \
+ \
+ rel2 { \
+ to: TO; \
+ } \
+ \
+ image { \
+ normal: IMG; \
+ border: 6 6 6 13; \
+ } \
+ } \
+ \
+ description { \
+ state: "clicked" 0.0; \
+ inherit: "default" 0.0; \
+ color: 255 255 255 192; \
+ } \
}

#define RESIZE_TOP(NAME, MIN, MAX, TO1, REL1, OFF1, TO2, REL2, OFF2,
COLOR) \

Modified: branches/e17/macros/border_programs.edc
==============================================================================
--- branches/e17/macros/border_programs.edc (original)
+++ branches/e17/macros/border_programs.edc Wed Mar 4 23:39:05 2009
@@ -7,9 +7,6 @@
action: STATE_SET "default" 0.0; \
transition: DECELERATE 0.5; \
target: "e.text.title"; \
- target: "button-min"; \
- target: "button-max"; \
- target: "button-close"; \
} \
program { \
name: "inactive"; \
@@ -18,57 +15,54 @@
action: STATE_SET "default" 0.1; \
transition: DECELERATE 0.5; \
target: "e.text.title"; \
- target: "button-min"; \
- target: "button-max"; \
- target: "button-close"; \
} \
program { \
name: "close_click"; \
signal: "mouse,down,1"; \
source: "button-close"; \
action: STATE_SET "clicked" 0.0; \
- transition: DECELERATE 0.15; \
- target: "close-clip"; \
+ target: "button-close_shadow"; \
+ target: "button-close_shadow_overlay"; \
} \
program { \
name: "close_unclick"; \
signal: "mouse,up,1"; \
source: "button-close"; \
action: STATE_SET "default" 0.0; \
- transition: DECELERATE 1.0; \
- target: "close-clip"; \
+ target: "button-close_shadow"; \
+ target: "button-close_shadow_overlay"; \
} \
program { \
name: "max_click"; \
signal: "mouse,down,1"; \
source: "button-max"; \
action: STATE_SET "clicked" 0.0; \
- transition: DECELERATE 0.15; \
- target: "max-clip"; \
+ target: "button-max_shadow"; \
+ target: "button-max_shadow_overlay"; \
} \
program { \
name: "max_unclick"; \
signal: "mouse,up,1"; \
source: "button-max"; \
action: STATE_SET "default" 0.0; \
- transition: DECELERATE 1.0; \
- target: "max-clip"; \
+ target: "button-max_shadow"; \
+ target: "button-max_shadow_overlay"; \
} \
program { \
name: "min_click"; \
signal: "mouse,down,1"; \
source: "button-min"; \
action: STATE_SET "clicked" 0.0; \
- transition: DECELERATE 0.15; \
- target: "min-clip"; \
+ target: "button-min_shadow"; \
+ target: "button-min_shadow_overlay"; \
} \
program { \
name: "min_unclick"; \
signal: "mouse,up,1"; \
source: "button-min"; \
action: STATE_SET "default" 0.0; \
- transition: DECELERATE 1.0; \
- target: "min-clip"; \
+ target: "button-min_shadow"; \
+ target: "button-min_shadow_overlay"; \
} \
program { \
name: "urgent"; \
@@ -103,16 +97,16 @@
signal: "mouse,down,1"; \
source: "button-close"; \
action: STATE_SET "clicked" 0.0; \
- transition: DECELERATE 0.15; \
- target: "close-clip"; \
+ target: "button-close_shadow"; \
+ target: "button-close_shadow_overlay"; \
} \
program { \
name: "close_unclick"; \
signal: "mouse,up,1"; \
source: "button-close"; \
action: STATE_SET "default" 0.0; \
- transition: DECELERATE 1.0; \
- target: "close-clip"; \
+ target: "button-close_shadow"; \
+ target: "button-close_shadow_overlay"; \
} \
program { \
name: "urgent"; \

Reply all

Reply to author

Forward

0 new messages