Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
spinner.edc tree.edc
Log Message:
* [Etk_Tree2] A future replacement of Etk_Tree. Still not usable
* [Etk_Spinner] A basic spinner widget that needs more work but it is
already usable
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/spinner.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- spinner.edc 10 Jul 2006 03:26:53 -0000 1.2
+++ spinner.edc 28 Nov 2006 21:40:06 -0000 1.3
@@ -1,6 +1,6 @@
group {
- name: "spin_button";
- min: 120 18;
+ name: "etk/spinner";
+ min: 60 18;
parts {
part {
name: "spinner";
@@ -15,7 +15,7 @@
offset: -1 8;
}
image {
- normal: "entry.png";
+ normal: "spinner_bg.png";
border: 8 8 8 8;
}
fill {
@@ -39,6 +39,24 @@
}
}
part {
+ name: "etk.swallow.text";
+ type: SWALLOW;
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 4 3;
+ to: "spinner";
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -17 -1;
+ to: "spinner";
+ }
+ }
+ }
+ FOCUS_GLOW(0.0, 0.0, 0, 0, "spinner", 1.0, 1.0, -1, -1, "spinner")
+ part {
name: "up_arrow";
clip_to: "clip";
description {
@@ -91,37 +109,19 @@
normal: "spinner_button_down2.png";
}
}
- }
- part {
- name: "text_area";
- type: SWALLOW;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 4 3;
- to: "spinner";
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -15 -3;
- to: "spinner";
- }
- }
}
- FOCUS_GLOW(0.0, 0.0, -1, -1, "spinner", 1.0, 1.0, 0, 0, "spinner")
}
programs {
program {
name: "spinner_focus";
- signal: "focus";
- source: "";
+ signal: "etk,state,focused";
+ source: "etk";
FOCUS_GLOW_ACTION
}
program {
name: "button_unfocus";
- signal: "unfocus";
- source: "";
+ signal: "etk,state,unfocused";
+ source: "etk";
UNFOCUS_GLOW_ACTION
}
program {
@@ -156,25 +156,121 @@
name: "up_arrow_pressed";
source: "up_arrow";
signal: "mouse,down,1*";
- action: SIGNAL_EMIT "scroll_up_start" "";
+ action: SIGNAL_EMIT "etk,action,increment,start" "";
}
program {
name: "up_arrow_released";
source: "up_arrow";
signal: "mouse,up,1";
- action: SIGNAL_EMIT "scroll_stop" "";
+ action: SIGNAL_EMIT "etk,action,increment,stop" "";
}
program {
name: "down_arrow_pressed";
source: "down_arrow";
signal: "mouse,down,1*";
- action: SIGNAL_EMIT "scroll_down_start" "";
+ action: SIGNAL_EMIT "etk,action,decrement,start" "";
}
program {
name: "down_arrow_released";
source: "down_arrow";
signal: "mouse,up,1";
- action: SIGNAL_EMIT "scroll_stop" "";
+ action: SIGNAL_EMIT "etk,action,decrement,stop" "";
}
+ }
+}
+
+group {
+ name: "etk/spinner/text";
+ parts {
+ part {
+ name: "etk.text.text";
+ type: TEXT;
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ color: 0 0 0 255;
+ text {
+ text: "Entry";
+ font: "Vera";
+ size: 10;
+ min: 1 1;
+ align: 0.0 0.5;
+ text_class: "spinner";
+ }
+ }
+ }
+ }
+}
+
+group {
+ name: "etk/spinner/cursor";
+ min: 1 0;
+ parts {
+ part {
+ name: "cursor";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ color: 0 0 0 255;
+ visible: 0;
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ }
+ programs {
+ program {
+ name: "on_cursor_show";
+ signal: "etk,action,show,cursor";
+ source: "etk";
+ action: ACTION_STOP;
+ target: "cursor_show";
+ target: "cursor_hide";
+ target: "cursor_show_timer";
+ target: "cursor_hide_timer";
+ after: "cursor_show";
+ }
+ program {
+ name: "cursor_show";
+ action: STATE_SET "visible" 0.0;
+ target: "cursor";
+ after: "cursor_show_timer";
+ }
+ program {
+ name: "cursor_hide";
+ action: STATE_SET "default" 0.0;
+ target: "cursor";
+ after: "cursor_hide_timer";
+ }
+ program {
+ name: "cursor_show_timer";
+ in: 1.0 0.0;
+ after: "cursor_hide";
+ }
+ program {
+ name: "cursor_hide_timer";
+ in: 0.25 0.0;
+ after: "cursor_show";
+ }
+ }
+}
+
+group {
+ name: "etk/spinner/selection";
+ data {
+ item: "on_foreground" "1";
+ }
+ parts {
+ part {
+ name: "selection";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ color: 245 205 109 102;
+ }
+ }
}
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- tree.edc 29 Oct 2006 11:39:54 -0000 1.21
+++ tree.edc 28 Nov 2006 21:40:06 -0000 1.22
@@ -1,4 +1,11 @@
group {
+ name: "etk/tree";
+ data {
+ item: "tree_contains_headers" "1";
+ item: "separator_color" "204 204 204 140";
+ }
+}
+group {
name: "etk/tree/grid";
data {
item: "separator_color" "204 204 204 140";
@@ -9,21 +16,18 @@
}
group {
name: "etk/tree/scrolled_view";
- data {
- item: "inset" "3 1 2 2";
- }
parts {
part {
- name: "border";
+ name: "background";
description {
state: "default" 0.0;
rel1 {
relative: 0.0 0.0;
- offset: 0 -1;
+ offset: 0 0;
}
rel2 {
relative: 1.0 1.0;
- offset: -1 1;
+ offset: -1 -1;
}
image {
normal: "tree.png";
@@ -41,11 +45,11 @@
state: "default" 0.0;
rel1 {
relative: 0.0 0.0;
- offset: 3 1;
+ offset: 3 3;
}
rel2 {
relative: 1.0 1.0;
- offset: -3 -3;
+ offset: -3 -5;
}
}
}
@@ -57,11 +61,11 @@
color: 255 255 255 180;
rel1 {
relative: 0.0 0.0;
- offset: 0 -1;
+ offset: 0 0;
}
rel2 {
relative: 1.0 1.0;
- offset: -1 1;
+ offset: -1 -1;
}
image {
normal: "tree_shadow.png";
@@ -73,10 +77,11 @@
}
}
}
- FOCUS_GLOW(0.0, 0.0, -1, 0, "border", 1.0, 1.0, 0, -1, "border")
+ /* TODO: this doesn't look good... */
+ //FOCUS_GLOW(0.0, 0.0, -1, 0, "background", 1.0, 1.0, 0, -1,
"background")
}
programs {
- program {
+ /*program {
name: "tree_focus";
signal: "etk,state,focused";
source: "etk";
@@ -87,7 +92,7 @@
signal: "etk,state,unfocused";
source: "etk";
UNFOCUS_GLOW_ACTION
- }
+ }*/
}
}
@@ -401,7 +406,7 @@
group {
name: "etk/tree/header";
data {
- item: "inset" "5 5 5 5";
+ item: "inset" "5 5 5 4";
}
parts {
part {
@@ -414,7 +419,7 @@
}
rel2 {
relative: 1.0 1.0;
- offset: -1 -1;
+ offset: 0 0;
}
image {
normal: "tree_header_inactive.png";
-------------------------------------------------------------------------
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
