[detour commit] r700 - in branches/e17: . bits
codesite...@google.com
Date: Fri Feb 6 15:31:58 2009
New Revision: 700
Modified:
branches/e17/TODO
branches/e17/bits/syscon.edc
Log:
Fix syscon
Modified: branches/e17/TODO
==============================================================================
--- branches/e17/TODO (original)
+++ branches/e17/TODO Fri Feb 6 15:31:58 2009
@@ -37,7 +37,6 @@
== Redo ==
Screen Resolution Settings icons.
--syscon.edc
-about_e.edc: ugly design, use [TABS]
-init.edc: better design
@@ -45,7 +44,6 @@
pager: states/anim for urgent windows on a desktop
scrollframe.edc: go over "part" names. Its hard to follow the code.
ibar: e/modules/ibar[ibox]/drop images
--syscon.edc: "e/widgets/syscon/item/button"
ICON("e/icons/enlightenment/colors", "icons/view-colors.png")
ICON("e/icons/enlightenment/startup_applications", "icons/applications-other2.png")
desktop/efm window overlay: overlay bg
Modified: branches/e17/bits/syscon.edc
==============================================================================
--- branches/e17/bits/syscon.edc (original)
+++ branches/e17/bits/syscon.edc Fri Feb 6 15:31:58 2009
@@ -64,7 +64,7 @@
min: 32 32;
rel1.to: "e.swallow.main";
rel1.relative: 0.0 1.0;
- rel1.offset: 0 12;
+ rel1.offset: 0 8;
rel2.to: "e.swallow.extra";
rel2.relative: 1.0 0.0;
rel2.offset: -1 -13;
@@ -79,10 +79,10 @@
state: "default" 0.0;
align: 0.5 1.0;
rel1.relative: 0.0 1.0;
- rel1.offset: 12 -13;
+ rel1.offset: 12 -3;
rel2.to_y: "button";
rel2.relative: 1.0 0.0;
- rel2.offset: -13 -13;
+ rel2.offset: -13 -3;
}
}
@@ -206,10 +206,10 @@
description {
state: "default" 0.0;
- min: 86 26;
- image.normal: "images/button_im4.png";
- image.border: 6 6 0 6;
+ min: 44 24;
color: 255 255 255 0;
+ image.normal: "images/button_im4.png";
+ image.border: 6 6 13 0;
rel1 {
to: "button_clip";
@@ -235,6 +235,12 @@
inherit: "default" 0.0;
color: 255 255 255 255;
}
+
+ description {
+ state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
}
part {
@@ -290,10 +296,10 @@
description {
state: "default" 0.0;
- min: 86 26;
+ min: 44 24;
+ color: 255 255 255 0;
image.normal: "images/button_im5.png";
image.border: 6 6 6 13;
- color: 255 255 255 0;
rel1 {
to: "button_clip";
@@ -319,6 +325,12 @@
inherit: "default" 0.0;
color: 255 255 255 255;
}
+
+ description {
+ state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
}
}
@@ -331,32 +343,17 @@
name: "e/widgets/syscon/item/button";
parts {
- part {
- name: "entry";
+ part {
+ name: "button_base";
type: IMAGE;
- mouse_events: 1;
+ mouse_events: 0;
- description {
+ description {
state: "default" 0.0;
- min: 32 16;
- image.normal: "images/entry_im0.png";
- image.border: 6 6 8 7;
-
- fill {
- #if USE_SMOOTH_IMAGES == 0
- smooth: 0;
- #else
- #if USE_SMOOTH_IMAGES == 1
- smooth: 1;
- #endif
- #endif
- }
- }
-
- description {
- state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 128;
+ fixed: 1 1;
+ image.normal: "images/button_im0.png";
+ image.border: 7 7 7 7;
+ color: 255 255 255 178;
}
}
@@ -368,6 +365,16 @@
description {
state: "default" 0.0;
color: 255 255 255 0;
+
+ rel1 {
+ to: "button";
+ offset: -1 0;
+ }
+
+ rel2 {
+ to: "button";
+ offset: 0 -1;
+ }
}
description {
@@ -384,17 +391,71 @@
description {
state: "default" 0.0;
- image.normal: "images/entry_im1.png";
- image.border: 6 6 6 6;
+ image.normal: "images/button_im3.png";
+ image.border: 7 7 7 7;
+
+ rel1 {
+ to: "focus_clip";
+ }
+
+ rel2 {
+ to: "focus_clip";
+ }
+
+ fill {
+ #if USE_SMOOTH_IMAGES == 0
+ smooth: 0;
+ #else
+ #if USE_SMOOTH_IMAGES == 1
+ smooth: 1;
+ #endif
+ #endif
+ }
+ }
+ }
+
+ part {
+ name: "button_clip";
+ type: RECT;
+ mouse_events: 0;
+
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 255;
rel1 {
- to: "entry";
+ to: "button_base";
+ relative: 0.0 0.0;
+ offset: 3 1;
+ }
+
+ rel2 {
+ to: "button_base";
+ relative: 1.0 1.0;
+ offset: -4 -2;
+ }
+ }
+ }
+
+ part {
+ name: "button";
+ type: IMAGE;
+ mouse_events: 1;
+ clip_to: "button_clip";
+
+ description {
+ state: "default" 0.0;
+ image.normal: "images/button_im1.png";
+ image.border: 7 7 7 7;
+
+ rel1 {
+ to: "button_clip";
relative: 0.0 0.0;
offset: 0 0;
}
rel2 {
- to: "entry";
+ to: "button_clip";
relative: 1.0 1.0;
offset: -1 -1;
}
@@ -409,36 +470,83 @@
#endif
}
}
+
+ description {
+ state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 224;
+ image.normal: "images/button_im2.png";
+ image.border: 11 11 10 10;
+ }
}
- part {
+ part {
+ name: "shadow";
+ type: IMAGE;
+ mouse_events: 0;
+ clip_to: "button_clip";
+
+ description {
+ state: "default" 0.0;
+ image.normal: "images/button_im4.png";
+ image.border: 6 6 13 0;
+ color: 255 255 255 0;
+
+ rel1 {
+ to: "button";
+ }
+
+ rel2 {
+ to: "button";
+ }
+
+ fill {
+ #if USE_SMOOTH_IMAGES == 0
+ smooth: 0;
+ #else
+ #if USE_SMOOTH_IMAGES == 1
+ smooth: 1;
+ #endif
+ #endif
+ }
+ }
+
+ description {
+ state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+
+ description {
+ state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+
+ part {
name: "e.text.label";
type: TEXT;
effect: SHADOW;
mouse_events: 0;
- scale: 1;
- description {
+ description {
state: "default" 0.0;
- fixed: 0 1;
- align: 0.5 1.0;
color: 60 60 60 255;
color3: 170 168 169 128;
- color_class: "button_text";
+ fixed: 0 1;
+ align: 0.5 1.0;
- rel1 {
- relative: 0.0 1.0;
- offset: 3 -4;
- to: "entry";
+ rel1 {
+ to: "button_clip";
+ offset: 0 2;
}
- rel2 {
- relative: 1.0 1.0;
- offset: -4 -4;
- to: "entry";
+ rel2 {
+ to: "button_clip";
+ offset: -1 -3;
}
-
text {
#if USE_FONTCONFIG == 0
font: "DejaVuSans-Bold";
@@ -447,7 +555,7 @@
font: "Sans:style=Bold";
#endif
#endif
- size: 10;
+ size: 11;
min: 1 1;
align: 0.5 1.0;
#if ENABLE_TEXT_CLASSES == 0
@@ -460,17 +568,69 @@
}
}
- description {
+ description {
+ state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 60 60 60 229;
+ color3: 170 168 169 64;
+ }
+
+ description {
+ state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ #if ENABLE_COLOR_CLASSES == 0
+ #else
+ #if ENABLE_COLOR_CLASSES == 1
+ color_class: "button_text_disabled";
+ #endif
+ #endif
+ color: 96 96 96 255;
+ color3: 170 168 169 128;
+ }
+ }
+
+ part {
+ name: "shadow_overlay";
+ type: IMAGE;
+ mouse_events: 0;
+ //clip_to: "button_clip";
+
+ description {
+ state: "default" 0.0;
+ min: 86 26;
+ image.normal: "images/button_im5.png";
+ image.border: 6 6 6 13;
+ color: 255 255 255 0;
+
+ rel1 {
+ to: "button";
+ }
+
+ rel2 {
+ to: "button";
+ }
+
+ fill {
+ #if USE_SMOOTH_IMAGES == 0
+ smooth: 0;
+ #else
+ #if USE_SMOOTH_IMAGES == 1
+ smooth: 1;
+ #endif
+ #endif
+ }
+ }
+
+ description {
+ state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+
+ description {
state: "disabled" 0.0;
inherit: "default" 0.0;
- #if ENABLE_COLOR_CLASSES == 0
- #else
- #if ENABLE_COLOR_CLASSES == 1
- color_class: "button_text_disabled";
- #endif
- #endif
- color: 96 96 96 255;
- color3: 170 168 169 128;
+ visible: 0;
}
}
@@ -483,17 +643,19 @@
aspect: 1.0 1.0;
aspect_preference: BOTH;
align: 0.5 0.5;
+ min: 24 24;
rel1 {
- to: "entry";
+ to: "button";
relative: 0.0 0.0;
- offset: 6 6;
+ offset: 8 8;
}
rel2 {
- to: "entry";
+ to_x: "button";
+ to_y: "e.text.label";
relative: 1.0 1.0;
- offset: -7 -7;
+ offset: -9 -18;
}
}
}
@@ -520,23 +682,27 @@
program {
name: "button_click";
signal: "mouse,down,1";
- source: "entry";
+ source: "button";
action: STATE_SET "clicked" 0.0;
target: "focus_clip";
+ target: "shadow";
+ target: "shadow_overlay";
}
program {
name: "button_unclick";
signal: "mouse,up,1";
- source: "entry";
+ source: "button";
action: STATE_SET "default" 0.0;
target: "focus_clip";
+ target: "shadow";
+ target: "shadow_overlay";
}
program {
name: "emit_click";
signal: "mouse,clicked,1";
- source: "entry";
+ source: "button";
action: SIGNAL_EMIT "e,action,click" "";
}
@@ -545,7 +711,10 @@
signal: "e,state,enabled";
source: "e";
action: STATE_SET "default" 0.0;
- target: "entry";
+ target: "button";
+ target: "shadow";
+ target: "e.text.label";
+ target: "shadow_overlay";
target: "disabler";
}
@@ -554,7 +723,10 @@
signal: "e,state,disabled";
source: "e";
action: STATE_SET "disabled" 0.0;
- target: "entry";
+ target: "button";
+ target: "shadow";
+ target: "e.text.label";
+ target: "shadow_overlay";
target: "disabler";
}
}