Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
button.edc colorpicker.edc combobox.edc entry.edc notebook.edc
paned.edc toggle_button.edc tree.edc
Log Message:
Lib:
----
* [Etk_Widget] Etk_Widget has now a generic way to swallow its children in its
theme-object. If a widget's theme-object has a part called
"etk.swallow.content",
the children of the widget will be automatically swallowed in this part. This
increases a lot the theming possibilities for certain widgets.
* [Etk_Shadow] A new simple container that can cast a shadow or have a border.
* [Etk_Widget] etk_widget_focused_get() --> etk_widget_is_focused().
* [Etk_Widget] Add etk_widget_focusable_set/get().
* [Etk_Widget] Clipping code has been rewritten and simplified.
* [Etk_Toplevel] Tab focusing is now "circular".
* [Etk_Object] etk_widget_name_set/get() --> etk_object_name_set/get() and
there is now etk_object_name_find() to get an object from its name.
* [Etk_Object] Fix a segv with etk_object_properties_set_valist() (it fixes
extrackt)
* [Etk_Box] Fix the focus order of the box.
Misc:
-----
* [Theme] "etk.swallow.child" --> "etk.swallow.content".
* [Theme] Improve the theme of the paned and the tree, and make the entry a bit
larger.
* [Test_Paned] Make the checkboxes effective.
* [Test_Entry] Improve the test.
* [Documentation] Documentation++
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/button.edc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- button.edc 6 Oct 2006 17:04:12 -0000 1.10
+++ button.edc 20 Oct 2006 17:51:43 -0000 1.11
@@ -31,7 +31,7 @@
}
}
part {
- name: "etk.swallow.child";
+ name: "etk.swallow.content";
type: SWALLOW;
mouse_events: 0;
description {
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/colorpicker.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- colorpicker.edc 6 Oct 2006 17:04:12 -0000 1.6
+++ colorpicker.edc 20 Oct 2006 17:51:44 -0000 1.7
@@ -204,7 +204,7 @@
}
rel2 {
relative: 1.0 1.0;
- offset: -1 1;
+ offset: -1 -1;
}
image {
normal: "colorpicker_slider_trough.png";
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/combobox.edc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- combobox.edc 6 Oct 2006 17:04:13 -0000 1.8
+++ combobox.edc 20 Oct 2006 17:51:44 -0000 1.9
@@ -83,7 +83,7 @@
}
}
part {
- name: "etk.swallow.child";
+ name: "etk.swallow.content";
type: SWALLOW;
mouse_events: 0;
description {
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/entry.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- entry.edc 6 Oct 2006 17:04:13 -0000 1.6
+++ entry.edc 20 Oct 2006 17:51:44 -0000 1.7
@@ -1,6 +1,6 @@
group {
name: "etk/entry";
- min: 120 18;
+ min: 120 20;
parts {
part {
name: "entry";
@@ -8,11 +8,11 @@
state: "default" 0.0;
rel1 {
relative: 0.0 0.5;
- offset: 0 -9;
+ offset: 0 -10;
}
rel2 {
relative: 1.0 0.5;
- offset: -1 8;
+ offset: -1 9;
}
image {
normal: "entry.png";
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/notebook.edc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- notebook.edc 6 Oct 2006 17:04:13 -0000 1.9
+++ notebook.edc 20 Oct 2006 17:51:44 -0000 1.10
@@ -15,7 +15,7 @@
offset: -1 -1;
}
image {
- normal: "tab.png";
+ normal: "notebook_tab.png";
border: 8 12 8 0;
}
fill {
@@ -79,7 +79,7 @@
}
}
part {
- name: "etk.swallow.child";
+ name: "etk.swallow.content";
type: SWALLOW;
mouse_events: 0;
description {
@@ -138,7 +138,7 @@
to: "tab";
}
image {
- normal: "tab_shadow.png";
+ normal: "notebook_tab_shadow.png";
}
fill {
smooth: 0;
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/paned.edc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- paned.edc 6 Oct 2006 17:04:13 -0000 1.7
+++ paned.edc 20 Oct 2006 17:51:44 -0000 1.8
@@ -3,26 +3,6 @@
min: 7 60;
parts {
part {
- name: "separator";
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.5 0.0;
- offset: -3 0;
- }
- rel2 {
- relative: 0.5 1.0;
- offset: 3 -1;
- }
- image {
- normal: "hpaned_separator.png";
- }
- fill {
- smooth: 0;
- }
- }
- }
- part {
name: "handle_clip";
type: RECT;
mouse_events: 0;
@@ -62,6 +42,27 @@
}
}
}
+ part {
+ name: "separator";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 0;
+ rel1 {
+ relative: 0.5 0.0;
+ offset: -3 0;
+ }
+ rel2 {
+ relative: 0.5 1.0;
+ offset: 3 -1;
+ }
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 120;
+ }
+ }
PANED_ARROW("left_arrow1", -27, 6, 20, 28, "handle", "left")
PANED_ARROW("left_arrow2", -47, 6, 20, 28, "handle", "left")
PANED_ARROW("left_arrow3", -67, 6, 20, 28, "handle", "left")
@@ -80,11 +81,25 @@
PANED_ARROWS_SHOW_ACTION("left", "right")
}
program {
+ name: "separator_in2";
+ signal: "mouse,in";
+ source: "separator";
+ action: STATE_SET "visible" 0.0;
+ target: "separator";
+ }
+ program {
name: "separator_out";
signal: "mouse,out";
source: "separator";
PANED_ARROWS_HIDE_ACTION("left", "right")
}
+ program {
+ name: "separator_out2";
+ signal: "mouse,out";
+ source: "separator";
+ action: STATE_SET "default" 0.0;
+ target: "separator";
+ }
PANED_ARROWS_PROG("left")
PANED_ARROWS_PROG("right")
}
@@ -95,26 +110,6 @@
min: 60 7;
parts {
part {
- name: "separator";
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.5;
- offset: 0 -3;
- }
- rel2 {
- relative: 1.0 0.5;
- offset: -1 3;
- }
- image {
- normal: "vpaned_separator.png";
- }
- fill {
- smooth: 0;
- }
- }
- }
- part {
name: "handle_clip";
type: RECT;
mouse_events: 0;
@@ -154,6 +149,27 @@
}
}
}
+ part {
+ name: "separator";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 0;
+ rel1 {
+ relative: 0.0 0.5;
+ offset: 0 -3;
+ }
+ rel2 {
+ relative: 1.0 0.5;
+ offset: -1 3;
+ }
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 120;
+ }
+ }
PANED_ARROW("up_arrow1", 6, -27, 28, 20, "handle", "up")
PANED_ARROW("up_arrow2", 6, -47, 28, 20, "handle", "up")
PANED_ARROW("up_arrow3", 6, -67, 28, 20, "handle", "up")
@@ -172,10 +188,24 @@
PANED_ARROWS_SHOW_ACTION("up", "down")
}
program {
+ name: "separator_in2";
+ signal: "mouse,in";
+ source: "separator";
+ action: STATE_SET "visible" 0.0;
+ target: "separator";
+ }
+ program {
name: "separator_out";
signal: "mouse,out";
source: "separator";
PANED_ARROWS_HIDE_ACTION("up", "down")
+ }
+ program {
+ name: "separator_out2";
+ signal: "mouse,out";
+ source: "separator";
+ action: STATE_SET "default" 0.0;
+ target: "separator";
}
PANED_ARROWS_PROG("up")
PANED_ARROWS_PROG("down")
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/toggle_button.edc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- toggle_button.edc 6 Oct 2006 17:04:13 -0000 1.10
+++ toggle_button.edc 20 Oct 2006 17:51:44 -0000 1.11
@@ -59,7 +59,7 @@
}
}
part {
- name: "etk.swallow.child";
+ name: "etk.swallow.content";
type: SWALLOW;
mouse_events: 0;
description {
@@ -110,6 +110,7 @@
action: STATE_SET "down" 0.0;
target: "toggle_button_clip";
target: "toggle_button_down";
+ target: "etk.swallow.content";
}
program {
name: "toggle_button_released";
@@ -118,6 +119,7 @@
action: STATE_SET "default" 0.0;
target: "toggle_button_clip";
target: "toggle_button_down";
+ target: "etk.swallow.content";
}
program {
name: "toggle_button_enter";
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- tree.edc 6 Oct 2006 17:04:13 -0000 1.19
+++ tree.edc 20 Oct 2006 17:51:44 -0000 1.20
@@ -1,12 +1,17 @@
group {
name: "etk/tree/grid";
data {
- item: "inset" "8 8 8 8";
item: "separator_color" "204 204 204 140";
item: "row_height" "24";
item: "cell_margins" "4 4 2 2";
item: "expander_size" "18";
}
+}
+group {
+ name: "etk/tree/scrolled_view";
+ data {
+ item: "inset" "3 1 2 2";
+ }
parts {
part {
name: "border";
@@ -14,23 +19,22 @@
state: "default" 0.0;
rel1 {
relative: 0.0 0.0;
- offset: 0 0;
+ offset: 0 -1;
}
rel2 {
relative: 1.0 1.0;
- offset: -1 -1;
+ offset: -1 1;
}
image {
normal: "tree.png";
border: 8 8 8 8;
- middle: 0;
}
fill {
smooth: 0;
}
}
}
- part {
+ /*part {
name: "middle";
type: RECT;
description {
@@ -45,6 +49,45 @@
offset: -9 -9;
}
}
+ }*/
+ part {
+ name: "etk.swallow.content";
+ type: SWALLOW;
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 3 1;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -3 -3;
+ }
+ }
+ }
+ part {
+ name: "shadow";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 180;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 -1;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 1;
+ }
+ image {
+ normal: "tree_shadow.png";
+ border: 12 12 12 12;
+ middle: 0;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
}
FOCUS_GLOW(0.0, 0.0, -1, -1, "border", 1.0, 1.0, 0, 0, "border")
DRAG_GLOW(0.0, 0.0, -1, -1, "border", 1.0, 1.0, 0, 0, "border");
@@ -82,37 +125,203 @@
}
}
}
+
group {
- name: "etk/tree/row";
+ name: "etk/tree/scrolled_view/hscrollbar";
+ min: 68 18;
parts {
part {
- name: "row";
+ name: "clip";
+ type: RECT;
description {
state: "default" 0.0;
- color: 255 255 255 255;
rel1 {
relative: 0.0 0.0;
offset: 0 0;
+ to: "trough";
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
+ to: "trough";
+ }
+ }
+ }
+ part {
+ name: "trough";
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ rel1 {
+ relative: 0.0 0.5;
+ offset: 0 -9;
+ }
+ rel2 {
+ relative: 1.0 0.5;
+ offset: -1 8;
}
image {
- normal: "tree_row_odd.png";
- border: 3 3 3 3;
+ normal: "hscrollbar_trough.png";
+ border: 8 8 8 8;
}
- fill {
- smooth: 0;
+ }
+ }
+ part {
+ name: "trough_bar";
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 1.0 0.5;
+ offset: 1 -1;
+ to_x: "left_arrow";
+ to_y: "trough";
+ }
+ rel2 {
+ relative: 0.0 0.5;
+ offset: -2 0;
+ to_x: "right_arrow";
+ to_y: "trough";
+ }
+ image {
+ normal: "hscrollbar_trough2.png";
+ border: 4 4 0 0;
}
}
+ }
+ part {
+ name: "confine";
+ type: RECT;
description {
- state: "even" 0.0;
- inherit: "default" 0.0;
+ state: "default" 0.0;
+ visible: 0;
+ rel1 {
+ relative: 0.0 0.5;
+ offset: -1 7;
+ to_x: "trough_bar";
+ }
+ rel2 {
+ relative: 1.0 0.5;
+ offset: 0 7;
+ to_x: "trough_bar";
+ }
+ }
+ }
+ SCROLLBAR_DRAG("etk.dragable.bar", 20, 16, 1, 0, "scrollbar_hdrag1.png",
"scrollbar_hdrag2.png", "scrollbar_hdrag_thumb.png", "clip")
+ SCROLLBAR_BUTTON("left_arrow", 0.0, 0.5, 0, -8,
"scrollbar_button_left1.png", "scrollbar_button_left2.png", "clip")
+ SCROLLBAR_BUTTON("right_arrow", 1.0, 0.5, -17, -8,
"scrollbar_button_right1.png", "scrollbar_button_right2.png", "clip")
+ }
+ programs {
+ SCROLLBAR_DRAG_PROG("etk.dragable.bar")
+ SCROLLBAR_BUTTON_PROG("left_arrow", "left")
+ SCROLLBAR_BUTTON_PROG("right_arrow", "right")
+ }
+}
+
+group {
+ name: "etk/tree/scrolled_view/vscrollbar";
+ min: 18 68;
+ parts {
+ part {
+ name: "clip";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ to: "trough";
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ to: "trough";
+ }
+ }
+ }
+ part {
+ name: "trough";
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ rel1 {
+ relative: 0.5 0.0;
+ offset: -9 0;
+ }
+ rel2 {
+ relative: 0.5 1.0;
+ offset: 8 -1;
+ }
+ image {
+ normal: "vscrollbar_trough.png";
+ border: 8 8 8 8;
+ }
+ }
+ }
+ part {
+ name: "trough_bar";
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.5 1.0;
+ offset: -1 1;
+ to_x: "trough";
+ to_y: "up_arrow";
+ }
+ rel2 {
+ relative: 0.5 0.0;
+ offset: 0 -2;
+ to_x: "trough";
+ to_y: "down_arrow";
+ }
image {
- normal: "tree_row_even.png";
- border: 3 3 3 3;
+ normal: "vscrollbar_trough2.png";
+ border: 0 0 4 4;
+ }
+ }
+ }
+ part {
+ name: "confine";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ rel1 {
+ relative: 0.5 0.0;
+ offset: 7 -1;
+ to_y: "trough_bar";
}
+ rel2 {
+ relative: 0.5 1.0;
+ offset: 7 0;
+ to_y: "trough_bar";
+ }
+ }
+ }
+ SCROLLBAR_DRAG("etk.dragable.bar", 16, 20, 0, 1, "scrollbar_vdrag1.png",
"scrollbar_vdrag2.png", "scrollbar_vdrag_thumb.png", "clip")
+ SCROLLBAR_BUTTON("up_arrow", 0.5, 0.0, -8, 0,
"scrollbar_button_up1.png", "scrollbar_button_up2.png", "clip")
+ SCROLLBAR_BUTTON("down_arrow", 0.5, 1.0, -8, -17,
"scrollbar_button_down1.png", "scrollbar_button_down2.png", "clip")
+ }
+ programs {
+ SCROLLBAR_DRAG_PROG("etk.dragable.bar")
+ SCROLLBAR_BUTTON_PROG("up_arrow", "up")
+ SCROLLBAR_BUTTON_PROG("down_arrow", "down")
+ }
+}
+
+group {
+ name: "etk/tree/row";
+ parts {
+ part {
+ name: "row";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ color: 244 244 244 255;
+ }
+ description {
+ state: "even" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
part {
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
