Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
check_button.edc menu.edc notebook.edc radio_button.edc
toggle_button.edc tree.edc
Added Files:
combobox.edc
Log Message:
* The menus have been rewritten: you can now have check and radio items. There
also has been an API breakage: etk_menu_item_imageèset now requires an
Etk_Menu_Item_Image and not an Etk_Menu_Item anymore
* The toggle/check/radio buttons has been rewritten
* Some fixes/cleanup
* The combobox widget has been started
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/check_button.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- check_button.edc 4 Dec 2005 14:54:56 -0000 1.4
+++ check_button.edc 4 Mar 2006 23:29:46 -0000 1.5
@@ -84,15 +84,15 @@
}
programs {
program {
- name: "check_button_activated";
- signal: "activated";
+ name: "check_button_activate";
+ signal: "activate";
source: "";
action: STATE_SET "on" 0.0;
target: "checkbox";
}
program {
- name: "check_button_desactivated";
- signal: "desactivated";
+ name: "check_button_deactivate";
+ signal: "deactivate";
source: "";
action: STATE_SET "default" 0.0;
target: "checkbox";
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/menu.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- menu.edc 20 Dec 2005 18:25:27 -0000 1.6
+++ menu.edc 4 Mar 2006 23:29:46 -0000 1.7
@@ -87,12 +87,13 @@
}
}
part {
- name: "image_swallow";
+ name: "left_widget_swallow";
type: SWALLOW;
mouse_events: 0;
description {
state: "invisible" 0.0;
visible: 0;
+ fixed: 1 1;
rel1 {
relative: 0.0 0.0;
offset: 0 0;
@@ -104,6 +105,7 @@
}
description {
state: "visible" 0.0;
+ fixed: 1 1;
rel1 {
relative: 0.0 0.5;
offset: 3 -8;
@@ -115,11 +117,10 @@
}
}
part {
- name: "right_swallow";
- type: SWALLOW;
+ name: "arrow";
mouse_events: 0;
description {
- state: "invisible" 0.0;
+ state: "default" 0.0;
visible: 0;
rel1 {
relative: 1.0 0.0;
@@ -129,16 +130,34 @@
relative: 1.0 1.0;
offset: -1 -1;
}
+ image {
+ normal: "menu_arrow.png";
+ }
}
description {
state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ rel1 {
+ relative: 1.0 0.5;
+ offset: -13 -6;
+ }
+ rel2 {
+ relative: 1.0 0.5;
+ offset: -1 5;
+ }
+ }
+ description {
+ state: "spacer" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
rel1 {
relative: 1.0 0.5;
- offset: -19 -8;
+ offset: -13 -6;
}
rel2 {
relative: 1.0 0.5;
- offset: -4 7;
+ offset: -1 5;
}
}
}
@@ -150,12 +169,12 @@
rel1 {
relative: 1.0 0.0;
offset: 0 0;
- to_x: "image_swallow";
+ to_x: "left_widget_swallow";
}
rel2 {
relative: 0.0 1.0;
offset: -1 -1;
- to_x: "right_swallow";
+ to_x: "arrow";
}
image {
normal: "menu_item_outline.png";
@@ -183,12 +202,12 @@
rel1 {
relative: 1.0 0.0;
offset: 0 0;
- to_x: "image_swallow";
+ to_x: "left_widget_swallow";
}
rel2 {
relative: 0.0 1.0;
offset: -1 -1;
- to_x: "right_swallow";
+ to_x: "arrow";
}
image {
normal: "menu_item_shadow2.png";
@@ -215,12 +234,12 @@
rel1 {
relative: 1.0 0.0;
offset: 0 0;
- to_x: "image_swallow";
+ to_x: "left_widget_swallow";
}
rel2 {
relative: 0.0 1.0;
offset: -1 -1;
- to_x: "right_swallow";
+ to_x: "arrow";
}
image {
normal: "menu_item_shadow1.png";
@@ -247,12 +266,12 @@
rel1 {
relative: 1.0 0.0;
offset: 0 0;
- to_x: "image_swallow";
+ to_x: "left_widget_swallow";
}
rel2 {
relative: 0.0 1.0;
offset: -1 -1;
- to_x: "right_swallow";
+ to_x: "arrow";
}
image {
normal: "menu_item_highlight.png";
@@ -279,12 +298,12 @@
rel1 {
relative: 1.0 0.0;
offset: 13 6;
- to_x: "image_swallow";
+ to_x: "left_widget_swallow";
}
rel2 {
relative: 0.0 1.0;
offset: -14 -7;
- to_x: "right_swallow";
+ to_x: "arrow";
}
text {
text: "label";
@@ -573,33 +592,40 @@
}
program {
- name: "image_show";
- signal: "image_show";
+ name: "left_widget_show";
+ signal: "left_widget_show";
source: "";
action: STATE_SET "visible" 0.0;
- target: "image_swallow";
+ target: "left_widget_swallow";
}
program {
- name: "image_hide";
- signal: "image_hide";
+ name: "left_widget_hide";
+ signal: "left_widget_hide";
source: "";
action: STATE_SET "invisible" 0.0;
- target: "image_swallow";
+ target: "left_widget_swallow";
}
program {
- name: "right_swallow_show";
- signal: "right_swallow_show";
+ name: "arrow_show";
+ signal: "arrow_show";
source: "";
action: STATE_SET "visible" 0.0;
- target: "right_swallow";
+ target: "arrow";
}
program {
- name: "right_swallow_hide";
- signal: "right_swallow_hide";
+ name: "arrow_spacer";
+ signal: "arrow_spacer";
source: "";
- action: STATE_SET "invisible" 0.0;
- target: "right_swallow";
+ action: STATE_SET "spacer" 0.0;
+ target: "arrow";
+ }
+ program {
+ name: "arrow_hide";
+ signal: "arrow_hide";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "arrow";
}
}
}
@@ -649,7 +675,7 @@
}
}
part {
- name: "image_swallow";
+ name: "left_widget_swallow";
type: SWALLOW;
mouse_events: 0;
description {
@@ -677,23 +703,6 @@
}
}
part {
- name: "right_swallow";
- type: SWALLOW;
- mouse_events: 0;
- description {
- state: "invisible" 0.0;
- visible: 0;
- rel1 {
- relative: 1.0 0.0;
- offset: -1 0;
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -1 -1;
- }
- }
- }
- part {
name: "item_shadow2";
mouse_events: 0;
description {
@@ -703,7 +712,7 @@
rel1 {
relative: 1.0 0.0;
offset: 0 0;
- to_x: "image_swallow";
+ to_x: "left_widget_swallow";
}
rel2 {
relative: 1.0 1.0;
@@ -734,7 +743,7 @@
rel1 {
relative: 1.0 0.0;
offset: 0 0;
- to_x: "image_swallow";
+ to_x: "left_widget_swallow";
}
rel2 {
relative: 1.0 1.0;
@@ -765,7 +774,7 @@
rel1 {
relative: 1.0 0.0;
offset: 0 0;
- to_x: "image_swallow";
+ to_x: "left_widget_swallow";
}
rel2 {
relative: 1.0 1.0;
@@ -796,7 +805,7 @@
rel1 {
relative: 1.0 0.0;
offset: 13 6;
- to_x: "image_swallow";
+ to_x: "left_widget_swallow";
}
rel2 {
relative: 1.0 1.0;
@@ -1085,45 +1094,23 @@
}
program {
- name: "image_show";
- signal: "image_show";
+ name: "left_widget_show";
+ signal: "left_widget_show";
source: "";
action: STATE_SET "visible" 0.0;
- target: "image_swallow";
+ target: "left_widget_swallow";
}
program {
- name: "image_hide";
- signal: "image_hide";
+ name: "left_widget_hide";
+ signal: "left_widget_hide";
source: "";
action: STATE_SET "invisible" 0.0;
- target: "image_swallow";
+ target: "left_widget_swallow";
}
}
}
group {
- name: "menu_arrow";
- parts {
- part {
- name: "arrow";
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.5 0.5;
- offset: -6 -6;
- }
- rel2 {
- relative: 0.5 0.5;
- offset: 6 5;
- }
- image {
- normal: "menu_arrow.png";
- }
- }
- }
- }
-}
-group {
- name: "menu_checkbox";
+ name: "menu_check";
parts {
part {
name: "check";
@@ -1153,6 +1140,22 @@
}
}
}
+ programs {
+ program {
+ name: "check";
+ signal: "check";
+ source: "";
+ action: STATE_SET "checked" 0.0;
+ target: "check";
+ }
+ program {
+ name: "uncheck";
+ signal: "uncheck";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "check";
+ }
+ }
}
group {
name: "menu_radio";
@@ -1185,6 +1188,22 @@
}
}
}
+ programs {
+ program {
+ name: "check";
+ signal: "check";
+ source: "";
+ action: STATE_SET "on" 0.0;
+ target: "radio";
+ }
+ program {
+ name: "uncheck";
+ signal: "uncheck";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "radio";
+ }
+ }
}
group {
name: "menu_separator";
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/notebook.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- notebook.edc 15 Jan 2006 11:07:16 -0000 1.4
+++ notebook.edc 4 Mar 2006 23:29:46 -0000 1.5
@@ -152,8 +152,8 @@
}
programs {
program {
- name: "tab_activated";
- signal: "activated";
+ name: "tab_activate";
+ signal: "activate";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.2;
@@ -161,8 +161,8 @@
target: "shadow";
}
program {
- name: "tab_desactivated";
- signal: "desactivated";
+ name: "tab_deactivate";
+ signal: "deactivate";
source: "";
action: STATE_SET "inactive" 0.0;
transition: LINEAR 0.2;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/radio_button.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- radio_button.edc 4 Dec 2005 14:54:56 -0000 1.4
+++ radio_button.edc 4 Mar 2006 23:29:46 -0000 1.5
@@ -58,15 +58,15 @@
}
programs {
program {
- name: "radio_button_activated";
- signal: "activated";
+ name: "radio_button_activate";
+ signal: "activate";
source: "";
action: STATE_SET "on" 0.0;
target: "radio";
}
program {
- name: "radio_button_desactivated";
- signal: "desactivated";
+ name: "radio_button_deactivate";
+ signal: "deactivate";
source: "";
action: STATE_SET "default" 0.0;
target: "radio";
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/toggle_button.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- toggle_button.edc 14 Feb 2006 02:28:02 -0000 1.6
+++ toggle_button.edc 4 Mar 2006 23:29:46 -0000 1.7
@@ -226,16 +226,16 @@
}
programs {
program {
- name: "toggle_button_activated";
- signal: "activated";
+ name: "toggle_button_activate";
+ signal: "activate";
source: "";
script {
activate();
}
}
program {
- name: "toggle_button_desactivated";
- signal: "desactivated";
+ name: "toggle_button_deactivate";
+ signal: "deactivate";
source: "";
script {
desactivate();
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- tree.edc 2 Mar 2006 14:37:50 -0000 1.13
+++ tree.edc 4 Mar 2006 23:29:46 -0000 1.14
@@ -319,15 +319,15 @@
}
programs {
program {
- name: "tree_checkbox_activated";
- signal: "activated";
+ name: "tree_checkbox_activate";
+ signal: "activate";
source: "";
action: STATE_SET "on" 0.0;
target: "checkbox";
}
program {
- name: "tree_checkbox_desactivated";
- signal: "deactivated";
+ name: "tree_checkbox_desactivate";
+ signal: "deactivate";
source: "";
action: STATE_SET "default" 0.0;
target: "checkbox";
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
