Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
slider.edc tree.edc
Log Message:
Lib:
----
* [Etk_Fixed] A new container that allows you to position widgets at fixed
coords (see the test app of the scrolled view in etk_test for an example)
* [Etk_Tree2] More work on Etk_Tree2: deletion and selection has been
implemented
Misc:
-----
* [Theme] The sliders now look like those of e17
* [Theme] The theme of the rows have been improved (better colors imho)
* [Autofoo] make dist is fixed
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/slider.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- slider.edc 6 Oct 2006 17:04:13 -0000 1.4
+++ slider.edc 9 Dec 2006 09:56:32 -0000 1.5
@@ -1,6 +1,6 @@
group {
name: "etk/hslider";
- min: 30 18;
+ min: 32 32;
parts {
part {
name: "slider_bar";
@@ -26,23 +26,25 @@
part {
name: "slider_bar_confine";
type: RECT;
+ mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
relative: 0.0 0.0;
- offset: -2 8;
+ offset: 3 6;
to: "slider_bar";
}
rel2 {
relative: 1.0 0.0;
- offset: 2 9;
+ offset: -5 7;
to: "slider_bar";
}
}
}
part {
name: "etk.dragable.slider";
+ type: RECT;
dragable {
confine: "slider_bar_confine";
x: 1 1 1;
@@ -50,58 +52,61 @@
}
description {
state: "default" 0.0;
- min: 34 18;
- max: 34 18;
- image {
- normal: "hhandle.png";
- border: 10 10 0 0;
+ color: 255 255 255 0;
+ min: 16 16;
+ max: 16 16;
+ }
+ }
+ part {
+ name: "slider_button";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ min: 32 32;
+ max: 32 32;
+ rel1 {
+ to: "etk.dragable.slider";
}
- fill {
- smooth: 0;
+ rel2 {
+ to: "etk.dragable.slider";
+ }
+ image {
+ normal: "slider_button1.png";
}
}
description {
state: "down" 0.0;
inherit: "default" 0.0;
image {
- normal: "hhandle_down.png";
+ normal: "slider_button2.png";
}
}
}
+ FOCUS_GLOW(0.0, 0.0, 0, -13, "slider_bar", 1.0, 1.0, -1, 10,
"slider_bar")
part {
- name: "dragable_thumb";
+ name: "slider_glow";
mouse_events: 0;
description {
state: "default" 0.0;
+ color: 255 255 255 0;
+ min: 32 32;
+ max: 32 32;
rel1 {
- relative: 0.5 0.5;
- offset: -9 -4;
- to: "etk.dragable.slider";
+ to: "slider_button";
}
rel2 {
- relative: 0.5 0.5;
- offset: 6 1;
- to: "etk.dragable.slider";
+ to: "slider_button";
}
image {
- normal: "hhandle_thumb.png";
- }
- fill {
- smooth: 0;
+ normal: "slider_button_glow.png";
}
}
description {
- state: "down" 0.0;
+ state: "visible" 0.0;
inherit: "default" 0.0;
- rel1 {
- offset: -8 -3;
- }
- rel2 {
- offset: 7 2;
- }
+ color: 255 255 255 255;
}
}
- FOCUS_GLOW(0.0, 0.0, 0, -9, "slider_bar", 1.0, 1.0, -1, 8, "slider_bar")
}
programs {
program {
@@ -109,16 +114,38 @@
signal: "mouse,down,1*";
source: "etk.dragable.slider";
action: STATE_SET "down" 0.0;
- target: "etk.dragable.slider";
- target: "dragable_thumb";
+ target: "slider_button";
}
program {
name: "hslider_drag_up";
signal: "mouse,up,1";
source: "etk.dragable.slider";
action: STATE_SET "default" 0.0;
- target: "etk.dragable.slider";
- target: "dragable_thumb";
+ target: "slider_button";
+ }
+ program {
+ name: "hslider_in";
+ signal: "mouse,in";
+ source: "etk.dragable.slider";
+ action: STATE_SET "visible" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "slider_glow";
+ after: "hslider_in2";
+ }
+ program {
+ name: "hslider_in2";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "slider_glow";
+ after: "hslider_in";
+ }
+ program {
+ name: "hslider_out";
+ signal: "mouse,out";
+ source: "etk.dragable.slider";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "slider_glow";
}
program {
name: "hslider_focus";
@@ -135,23 +162,21 @@
}
}
-
group {
name: "etk/vslider";
- min: 18 30;
+ min: 32 32;
parts {
part {
name: "slider_bar";
description {
state: "default" 0.0;
- color: 242 242 242 255;
rel1 {
relative: 0.5 0.0;
offset: -1 0;
}
rel2 {
relative: 0.5 1.0;
- offset: 0 -1;
+ offset: -1 0;
}
image {
normal: "vslider_bar.png";
@@ -165,23 +190,25 @@
part {
name: "slider_bar_confine";
type: RECT;
+ mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
relative: 0.0 0.0;
- offset: 9 -2;
+ offset: 6 3;
to: "slider_bar";
}
rel2 {
relative: 0.0 1.0;
- offset: 10 2;
+ offset: 7 -5;
to: "slider_bar";
}
}
}
part {
name: "etk.dragable.slider";
+ type: RECT;
dragable {
confine: "slider_bar_confine";
x: 0 0 0;
@@ -189,58 +216,61 @@
}
description {
state: "default" 0.0;
- min: 18 34;
- max: 18 34;
- image {
- normal: "vhandle.png";
- border: 0 0 10 10;
+ color: 255 255 255 0;
+ min: 16 16;
+ max: 16 16;
+ }
+ }
+ part {
+ name: "slider_button";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ min: 32 32;
+ max: 32 32;
+ rel1 {
+ to: "etk.dragable.slider";
}
- fill {
- smooth: 0;
+ rel2 {
+ to: "etk.dragable.slider";
+ }
+ image {
+ normal: "slider_button1.png";
}
}
description {
state: "down" 0.0;
inherit: "default" 0.0;
image {
- normal: "vhandle_down.png";
+ normal: "slider_button2.png";
}
}
}
+ FOCUS_GLOW(0.0, 0.0, -13, 0, "slider_bar", 1.0, 1.0, 10, -1,
"slider_bar")
part {
- name: "dragable_thumb";
+ name: "slider_glow";
mouse_events: 0;
description {
state: "default" 0.0;
+ color: 255 255 255 0;
+ min: 32 32;
+ max: 32 32;
rel1 {
- relative: 0.5 0.5;
- offset: -4 -9;
- to: "etk.dragable.slider";
+ to: "slider_button";
}
rel2 {
- relative: 0.5 0.5;
- offset: 1 6;
- to: "etk.dragable.slider";
+ to: "slider_button";
}
image {
- normal: "vhandle_thumb.png";
- }
- fill {
- smooth: 0;
+ normal: "slider_button_glow.png";
}
}
description {
- state: "down" 0.0;
+ state: "visible" 0.0;
inherit: "default" 0.0;
- rel1 {
- offset: -3 -8;
- }
- rel2 {
- offset: 2 7;
- }
+ color: 255 255 255 255;
}
}
- FOCUS_GLOW(0.0, 0.0, -9, 0, "slider_bar", 1.0, 1.0, 8, -1, "slider_bar")
}
programs {
program {
@@ -248,16 +278,38 @@
signal: "mouse,down,1*";
source: "etk.dragable.slider";
action: STATE_SET "down" 0.0;
- target: "etk.dragable.slider";
- target: "dragable_thumb";
+ target: "slider_button";
}
program {
name: "vslider_drag_up";
signal: "mouse,up,1";
source: "etk.dragable.slider";
action: STATE_SET "default" 0.0;
- target: "etk.dragable.slider";
- target: "dragable_thumb";
+ target: "slider_button";
+ }
+ program {
+ name: "vslider_in";
+ signal: "mouse,in";
+ source: "etk.dragable.slider";
+ action: STATE_SET "visible" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "slider_glow";
+ after: "vslider_in2";
+ }
+ program {
+ name: "vslider_in2";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "slider_glow";
+ after: "vslider_in";
+ }
+ program {
+ name: "vslider_out";
+ signal: "mouse,out";
+ source: "etk.dragable.slider";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "slider_glow";
}
program {
name: "vslider_focus";
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- tree.edc 28 Nov 2006 21:40:06 -0000 1.22
+++ tree.edc 9 Dec 2006 09:56:32 -0000 1.23
@@ -286,25 +286,21 @@
type: RECT;
description {
state: "default" 0.0;
- color: 244 244 244 255;
+ color: 239 239 239 255;
}
description {
state: "even" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 250 250 250 255;
}
}
part {
- name: "select_rect";
+ name: "select_clip";
type: RECT;
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
- //color: 239 191 114 80;
- //color: 245 205 109 102;
- //color: 245 205 109 127;
- color: 254 235 199 170;
rel1 {
relative: 0.0 0.0;
offset: 0 0;
@@ -319,6 +315,30 @@
inherit: "default" 0.0;
visible: 1;
}
+
+ }
+ part {
+ name: "select_rect";
+ type: RECT;
+ clip_to: "select_clip";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ color: 247 236 202 255;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ }
+ description {
+ state: "even" 0.0;
+ inherit: "default" 0.0;
+ color: 252 241 207 255;
+ }
}
}
programs {
@@ -328,6 +348,7 @@
source: "etk";
action: STATE_SET "even" 0.0;
target: "row";
+ target: "select_rect";
}
program {
name: "row_odd";
@@ -335,20 +356,21 @@
source: "etk";
action: STATE_SET "default" 0.0;
target: "row";
+ target: "select_rect";
}
program {
name: "row_select";
signal: "etk,state,selected";
source: "etk";
action: STATE_SET "selected" 0.0;
- target: "select_rect";
+ target: "select_clip";
}
program {
name: "row_unselect";
signal: "etk,state,unselected";
source: "etk";
action: STATE_SET "default" 0.0;
- target: "select_rect";
+ target: "select_clip";
}
}
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
