****** MAJOR THEME REWORKING -- BREAKAGE *********

Almost every signal and required part name has changed. This means that ALL themes other than the default one are now broken. Sorry, but this had to happen.

I have a list of mappings from old to new at http://rephorm.com/files/dump/e_theme_map.txt

There will probably be a little more cleanup on this in the coming days. Then I'll write it all up in a nice theme spec.


SVN revision: 25033
This commit is contained in:
rephorm 2006-08-22 07:39:11 +00:00 committed by rephorm
parent 49c524e4c7
commit a5c71890d4
88 changed files with 1356 additions and 1201 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 56 KiB

View File

@ -232,11 +232,11 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "about"; to: "e.text.about";
offset: -7 -7; offset: -7 -7;
} }
rel2 { rel2 {
to: "about"; to: "e.text.about";
offset: 6 6; offset: 6 6;
} }
image { image {
@ -251,11 +251,11 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "authors"; to: "e.text.authors";
offset: -7 -7; offset: -7 -7;
} }
rel2 { rel2 {
to: "authors"; to: "e.text.authors";
offset: 6 6; offset: 6 6;
} }
image { image {
@ -302,7 +302,7 @@ group {
} }
} }
part { part {
name: "about"; name: "e.text.about";
type: TEXTBLOCK; type: TEXTBLOCK;
mouse_events: 0; mouse_events: 0;
description { description {
@ -310,7 +310,7 @@ group {
max: 200 1000; max: 200 1000;
min: 200 0; min: 200 0;
rel1 { rel1 {
to_y: "version"; to_y: "e.text.version";
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 16 8; offset: 16 8;
} }
@ -327,7 +327,7 @@ group {
} }
} }
part { part {
name: "authors"; name: "e.text.authors";
type: TEXTBLOCK; type: TEXTBLOCK;
mouse_events: 0; mouse_events: 0;
description { description {
@ -335,7 +335,7 @@ group {
max: 1000 1000; max: 1000 1000;
min: 200 0; min: 200 0;
rel1 { rel1 {
to_y: "version"; to_y: "e.text.version";
to_x: "logo"; to_x: "logo";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 8 8; offset: 8 8;
@ -386,7 +386,7 @@ group {
} }
} }
part { part {
name: "title"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
mouse_events: 0; mouse_events: 0;
@ -415,7 +415,7 @@ group {
} }
} }
part { part {
name: "version"; name: "e.text.version";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
mouse_events: 0; mouse_events: 0;
@ -424,12 +424,12 @@ group {
fixed: 0 1; fixed: 0 1;
align: 0.5 0.0; align: 0.5 0.0;
rel1 { rel1 {
to: "title"; to: "e.text.title";
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 6 2; offset: 6 2;
} }
rel2 { rel2 {
to: "title"; to: "e.text.title";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -7 2; offset: -7 2;
} }
@ -458,12 +458,12 @@ group {
rel1 { rel1 {
relative: 0.5 0.5; relative: 0.5 0.5;
offset: 0 0; offset: 0 0;
to_y: "about"; to_y: "e.text.about";
} }
rel2 { rel2 {
relative: 0.5 0.5; relative: 0.5 0.5;
offset: 0 0; offset: 0 0;
to_y: "about"; to_y: "e.text.about";
} }
image { image {
normal: "e17_logo.png"; normal: "e17_logo.png";
@ -549,7 +549,7 @@ group {
name: "button_unclick2"; name: "button_unclick2";
signal: "mouse,clicked,1"; signal: "mouse,clicked,1";
source: "button"; source: "button";
action: SIGNAL_EMIT "close" ""; action: SIGNAL_EMIT "e,action,close" "";
} }
program { program {

View File

@ -232,43 +232,43 @@ group {
programs { programs {
program { program {
name: "charge"; name: "charge";
signal: "charge"; signal: "e,state,charging";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "fade_clip"; target: "fade_clip";
} }
program { program {
name: "charge2"; name: "charge2";
signal: "charge"; signal: "e,state,charging";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "ac"; target: "ac";
} }
program { program {
name: "discharge"; name: "discharge";
signal: "discharge"; signal: "e,state,discharging";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "fade_clip"; target: "fade_clip";
} }
program { program {
name: "discharge2"; name: "discharge2";
signal: "discharge"; signal: "e,state,discharging";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "ac"; target: "ac";
} }
program { program {
name: "unknown"; name: "unknown";
signal: "unknown"; signal: "e,state,unknown";
source: ""; source: "e";
action: STATE_SET "faded" 0.0; action: STATE_SET "faded" 0.0;
target: "fade_clip"; target: "fade_clip";
} }
program { program {
name: "pulse"; name: "pulse";
signal: "pulse"; signal: "e,action,pulse,start";
source: ""; source: "e";
action: STATE_SET "faded" 0.0; action: STATE_SET "faded" 0.0;
transition: ACCELERATE 0.3; transition: ACCELERATE 0.3;
after: "pulse2"; after: "pulse2";
@ -277,15 +277,15 @@ group {
program { program {
name: "pulse2"; name: "pulse2";
signal: "pulse2"; signal: "pulse2";
source: ""; source: "e";
action: STATE_SET "faded" 1.0; action: STATE_SET "faded" 1.0;
transition: ACCELERATE 0.1; transition: ACCELERATE 0.1;
target: "pulse_clip"; target: "pulse_clip";
} }
program { program {
name: "pulsestop"; name: "pulsestop";
signal: "pulsestop"; signal: "e,action,pulse,stop";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "pulse_clip"; target: "pulse_clip";
} }

View File

@ -157,7 +157,7 @@ BORDER_BUTTON_ADV(NAME,TYPE,REL1X,REL1Y,OFF1X,OFF1Y,TO1,TO1,REL2X,REL2Y,OFF2X,OF
} \ } \
} \ } \
} \ } \
part { \ part { /* a rect for positioning */ \
name: NAME; \ name: NAME; \
type: RECT; \ type: RECT; \
description { \ description { \
@ -179,7 +179,18 @@ BORDER_BUTTON_ADV(NAME,TYPE,REL1X,REL1Y,OFF1X,OFF1Y,TO1,TO1,REL2X,REL2Y,OFF2X,OF
} \ } \
color: 0 0 0 0; \ color: 0 0 0 0; \
} \ } \
} } \
part { /* a rect for window manager actions */ \
name: "e.event."NAME; \
type: RECT; \
repeat_events: 1; \
description { \
state: "default" 0.0; \
color: 0 0 0 0; \
rel1.to: NAME; \
rel2.to: NAME; \
} \
} \
#define FULL_SIZE_BORDER_BUTTON(TYPE) \ #define FULL_SIZE_BORDER_BUTTON(TYPE) \
group { \ group { \
@ -291,8 +302,8 @@ group {
offset: 0 7; offset: 0 7;
} }
text { text {
text_source: "title_text"; text_source: "e.text.title";
source: "title_text"; source: "e.text.title";
min: 0 1; min: 0 1;
text_class: "title_bar"; text_class: "title_bar";
} }
@ -789,7 +800,7 @@ group {
} }
} }
part { part {
name: "title_text"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -1013,7 +1024,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -1031,7 +1042,7 @@ group {
} }
} }
part { part {
name: "resize_l"; name: "e.event.resize.l";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -1048,7 +1059,7 @@ group {
} }
} }
part { part {
name: "resize_r"; name: "e.event.resize.r";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -1065,7 +1076,7 @@ group {
} }
} }
part { part {
name: "resize_b"; name: "e.event.resize.b";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -1081,7 +1092,7 @@ group {
} }
} }
part { part {
name: "resize_bl"; name: "e.event.resize.bl";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -1097,7 +1108,7 @@ group {
} }
} }
part { part {
name: "resize_br"; name: "e.event.resize.br";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -1113,7 +1124,7 @@ group {
} }
} }
part { part {
name: "client"; name: "e.client";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -1136,21 +1147,21 @@ group {
BORDER_BUTTON("minimize","minimize",0.0,0.0,3,0,"maximize",0.0,1.0,3,-1,"maximize") BORDER_BUTTON("minimize","minimize",0.0,0.0,3,0,"maximize",0.0,1.0,3,-1,"maximize")
part { part {
name: "icon"; name: "e.event.icon";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
color: 0 0 0 0; color: 0 0 0 0;
} }
} }
part { part {
name: "title"; name: "e.event.titlebar";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -1167,8 +1178,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -1244,8 +1255,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -1471,8 +1482,8 @@ group {
} }
program { program {
name: "maximize_fullscreen"; name: "maximize_fullscreen";
signal: "maximize,fullscreen"; signal: "e,action,maximize,fullscreen";
source: ""; source: "e";
action: STATE_SET "hidden" 0.0; action: STATE_SET "hidden" 0.0;
target: "t1"; target: "t1";
target: "t3"; target: "t3";
@ -1484,8 +1495,8 @@ group {
} }
program { program {
name: "unmaximize_fullscreen"; name: "unmaximize_fullscreen";
signal: "unmaximize,fullscreen"; signal: "e,action,unmaximize,fullscreen";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "t1"; target: "t1";
target: "t3"; target: "t3";
@ -1498,8 +1509,8 @@ group {
program { program {
name: "go_hung"; name: "go_hung";
signal: "hung"; signal: "e,state,hung";
source: ""; source: "e";
action: STATE_SET "hung" 0.0; action: STATE_SET "hung" 0.0;
target: "title_hung"; target: "title_hung";
transition: DECELERATE 0.5; transition: DECELERATE 0.5;
@ -1514,8 +1525,8 @@ group {
} }
program { program {
name: "go_unhung"; name: "go_unhung";
signal: "unhung"; signal: "e,state,unhung";
source: ""; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "go_hung"; target: "go_hung";
target: "go_hung2"; target: "go_hung2";
@ -1571,8 +1582,8 @@ group {
offset: 0 7; offset: 0 7;
} }
text { text {
text_source: "title_text"; text_source: "e.text.title";
source: "title_text"; source: "e.text.title";
min: 0 1; min: 0 1;
text_class: "title_bar"; text_class: "title_bar";
} }
@ -1654,7 +1665,7 @@ group {
} }
} }
part { part {
name: "resize_br"; name: "e.event.resize.br";
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
@ -1692,7 +1703,7 @@ group {
} }
} }
part { part {
name: "resize_bl"; name: "e.event.resize.bl";
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
@ -1924,7 +1935,7 @@ group {
} }
} }
part { part {
name: "title_text"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -2148,7 +2159,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -2166,20 +2177,20 @@ group {
} }
} }
part { part {
name: "client"; name: "e.client";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 4 0; offset: 4 0;
to_x: "resize_bl"; to_x: "e.event.resize.bl";
to_y: "t1"; to_y: "t1";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -5 -5; offset: -5 -5;
to: "resize_br"; to: "e.event.resize.br";
} }
} }
} }
@ -2189,21 +2200,21 @@ group {
BORDER_BUTTON("minimize","minimize",0.0,0.0,3,0,"maximize",0.0,1.0,3,-1,"maximize") BORDER_BUTTON("minimize","minimize",0.0,0.0,3,0,"maximize",0.0,1.0,3,-1,"maximize")
part { part {
name: "icon"; name: "e.event.icon";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
color: 0 0 0 0; color: 0 0 0 0;
} }
} }
part { part {
name: "title"; name: "e.event.titlebar";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -2220,8 +2231,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -2297,8 +2308,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -2524,25 +2535,25 @@ group {
} }
program { program {
name: "maximize_fullscreen"; name: "maximize_fullscreen";
signal: "maximize,fullscreen"; signal: "e,action,maximize,fullscreen";
source: ""; source: "e";
action: STATE_SET "hidden" 0.0; action: STATE_SET "hidden" 0.0;
target: "resize_bl"; target: "e.event.resize.bl";
target: "resize_br"; target: "e.event.resize.br";
} }
program { program {
name: "unmaximize_fullscreen"; name: "unmaximize_fullscreen";
signal: "unmaximize,fullscreen"; signal: "e,action,unmaximize,fullscreen";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "resize_bl"; target: "e.event.resize.bl";
target: "resize_br"; target: "e.event.resize.br";
} }
program { program {
name: "go_hung"; name: "go_hung";
signal: "hung"; signal: "e,state,hung";
source: ""; source: "e";
action: STATE_SET "hung" 0.0; action: STATE_SET "hung" 0.0;
target: "title_hung"; target: "title_hung";
transition: DECELERATE 0.5; transition: DECELERATE 0.5;
@ -2557,8 +2568,8 @@ group {
} }
program { program {
name: "go_unhung"; name: "go_unhung";
signal: "unhung"; signal: "e,state,unhung";
source: ""; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "go_hung"; target: "go_hung";
target: "go_hung2"; target: "go_hung2";
@ -2614,8 +2625,8 @@ group {
offset: 0 7; offset: 0 7;
} }
text { text {
text_source: "title_text"; text_source: "e.text.title";
source: "title_text"; source: "e.text.title";
min: 0 1; min: 0 1;
text_class: "title_bar"; text_class: "title_bar";
} }
@ -3112,7 +3123,7 @@ group {
} }
} }
part { part {
name: "title_text"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -3336,7 +3347,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -3354,7 +3365,7 @@ group {
} }
} }
part { part {
name: "resize_l"; name: "e.event.resize.l";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -3371,7 +3382,7 @@ group {
} }
} }
part { part {
name: "resize_r"; name: "e.event.resize.r";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -3388,7 +3399,7 @@ group {
} }
} }
part { part {
name: "resize_b"; name: "e.event.resize.b";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -3404,7 +3415,7 @@ group {
} }
} }
part { part {
name: "resize_bl"; name: "e.event.resize.bl";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -3420,7 +3431,7 @@ group {
} }
} }
part { part {
name: "resize_br"; name: "e.event.resize.br";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -3436,7 +3447,7 @@ group {
} }
} }
part { part {
name: "client"; name: "e.client";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -3457,21 +3468,21 @@ group {
BORDER_BUTTON_ADV("close","close",0.0,0.0, 0,0,"whole", "whole",1.0,1.0,-1,5,"whole", "title2") BORDER_BUTTON_ADV("close","close",0.0,0.0, 0,0,"whole", "whole",1.0,1.0,-1,5,"whole", "title2")
part { part {
name: "icon"; name: "e.event.icon";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
color: 0 0 0 0; color: 0 0 0 0;
} }
} }
part { part {
name: "title"; name: "e.event.titlebar";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -3488,8 +3499,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -3565,8 +3576,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -3663,8 +3674,8 @@ group {
program { program {
name: "maximize_fullscreen"; name: "maximize_fullscreen";
signal: "maximize,fullscreen"; signal: "e,action,maximize,fullscreen";
source: ""; source: "e";
action: STATE_SET "hidden" 0.0; action: STATE_SET "hidden" 0.0;
target: "t1"; target: "t1";
target: "t3"; target: "t3";
@ -3676,8 +3687,8 @@ group {
} }
program { program {
name: "unmaximize_fullscreen"; name: "unmaximize_fullscreen";
signal: "unmaximize,fullscreen"; signal: "e,action,unmaximize,fullscreen";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "t1"; target: "t1";
target: "t3"; target: "t3";
@ -3690,8 +3701,8 @@ group {
program { program {
name: "go_hung"; name: "go_hung";
signal: "hung"; signal: "e,state,hung";
source: ""; source: "e";
action: STATE_SET "hung" 0.0; action: STATE_SET "hung" 0.0;
target: "title_hung"; target: "title_hung";
transition: DECELERATE 0.5; transition: DECELERATE 0.5;
@ -3706,8 +3717,8 @@ group {
} }
program { program {
name: "go_unhung"; name: "go_unhung";
signal: "unhung"; signal: "e,state,unhung";
source: ""; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "go_hung"; target: "go_hung";
target: "go_hung2"; target: "go_hung2";
@ -3763,8 +3774,8 @@ group {
offset: 0 7; offset: 0 7;
} }
text { text {
text_source: "title_text"; text_source: "e.text.title";
source: "title_text"; source: "e.text.title";
min: 0 1; min: 0 1;
text_class: "title_bar"; text_class: "title_bar";
} }
@ -4261,7 +4272,7 @@ group {
} }
} }
part { part {
name: "title_text"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -4485,7 +4496,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -4503,7 +4514,7 @@ group {
} }
} }
part { part {
name: "client"; name: "e.client";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -4524,21 +4535,21 @@ group {
BORDER_BUTTON_ADV("close","close",0.0,0.0, 0,0,"whole", "whole",1.0,1.0,-1,5,"whole", "title2") BORDER_BUTTON_ADV("close","close",0.0,0.0, 0,0,"whole", "whole",1.0,1.0,-1,5,"whole", "title2")
part { part {
name: "icon"; name: "e.event.icon";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
color: 0 0 0 0; color: 0 0 0 0;
} }
} }
part { part {
name: "title"; name: "e.event.titlebar";
type: RECT; type: RECT;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -4555,8 +4566,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -4632,8 +4643,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -4730,8 +4741,8 @@ group {
program { program {
name: "maximize_fullscreen"; name: "maximize_fullscreen";
signal: "maximize,fullscreen"; signal: "e,action,maximize,fullscreen";
source: ""; source: "e";
action: STATE_SET "hidden" 0.0; action: STATE_SET "hidden" 0.0;
target: "t1"; target: "t1";
target: "t3"; target: "t3";
@ -4743,8 +4754,8 @@ group {
} }
program { program {
name: "unmaximize_fullscreen"; name: "unmaximize_fullscreen";
signal: "unmaximize,fullscreen"; signal: "e,action,unmaximize,fullscreen";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "t1"; target: "t1";
target: "t3"; target: "t3";
@ -4757,8 +4768,8 @@ group {
program { program {
name: "go_hung"; name: "go_hung";
signal: "hung"; signal: "e,state,hung";
source: ""; source: "e";
action: STATE_SET "hung" 0.0; action: STATE_SET "hung" 0.0;
target: "title_hung"; target: "title_hung";
transition: DECELERATE 0.5; transition: DECELERATE 0.5;
@ -4773,8 +4784,8 @@ group {
} }
program { program {
name: "go_unhung"; name: "go_unhung";
signal: "unhung"; signal: "e,state,unhung";
source: ""; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "go_hung"; target: "go_hung";
target: "go_hung2"; target: "go_hung2";
@ -4862,7 +4873,7 @@ group {
} }
} }
part { part {
name: "client"; name: "e.client";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;

View File

@ -61,7 +61,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -98,7 +98,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -107,7 +107,7 @@ group {
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 4 8; offset: 4 8;
to_x: "icon_swallow"; to_x: "e.swallow.icon";
to_y: "button_image"; to_y: "button_image";
} }
rel2 { rel2 {
@ -327,14 +327,14 @@ group {
name: "button_unclick2"; name: "button_unclick2";
signal: "mouse,clicked,1"; signal: "mouse,clicked,1";
source: "button_image"; source: "button_image";
action: SIGNAL_EMIT "click" ""; action: SIGNAL_EMIT "e,action,click" "";
} }
program { program {
name: "icon_visible"; name: "icon_visible";
signal: "icon_visible"; signal: "e,action,show,icon";
source: ""; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
target: "icon_swallow"; target: "e.swallow.icon";
} }
program { program {
name: "button_in"; name: "button_in";
@ -395,37 +395,37 @@ group {
} }
program { program {
name: "focus_in"; name: "focus_in";
signal: "focus_in"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.2; transition: DECELERATE 0.2;
target: "focus"; target: "focus";
} }
program { program {
name: "focus_out"; name: "focus_out";
signal: "focus_out"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.5; transition: ACCELERATE 0.5;
target: "focus"; target: "focus";
} }
program { program {
name: "disable"; name: "disable";
signal: "disabled"; signal: "e,state,disabled";
source: ""; source: "e";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;
target: "button_image"; target: "button_image";
target: "button_image2"; target: "button_image2";
target: "label"; target: "e.text.label";
} }
program { program {
name: "enable"; name: "enable";
signal: "enabled"; signal: "e,state,enabled";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "button_image"; target: "button_image";
target: "button_image2"; target: "button_image2";
target: "label"; target: "e.text.label";
} }
} }
} }

View File

@ -63,7 +63,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -137,15 +137,15 @@ group {
programs { programs {
program { program {
name: "turn_on1"; name: "turn_on1";
signal: "toggle_on"; signal: "e,state,checked";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "item1"; target: "item1";
} }
program { program {
name: "turn_off1"; name: "turn_off1";
signal: "toggle_off"; signal: "e,state,unchecked";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "item1"; target: "item1";
} }
@ -153,41 +153,41 @@ group {
name: "click"; name: "click";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "event"; source: "event";
action: SIGNAL_EMIT "toggled" ""; action: SIGNAL_EMIT "e,action,toggle" "";
} }
program { program {
name: "focus_in"; name: "focus_in";
signal: "focus_in"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.2; transition: DECELERATE 0.2;
target: "focus"; target: "focus";
} }
program { program {
name: "focus_out"; name: "focus_out";
signal: "focus_out"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.5; transition: ACCELERATE 0.5;
target: "focus"; target: "focus";
} }
program { program {
name: "disable"; name: "disable";
signal: "disabled"; signal: "e,state,disabled";
source: ""; source: "e";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;
target: "outline"; target: "outline";
target: "event"; target: "event";
target: "label"; target: "e.text.label";
} }
program { program {
name: "enable"; name: "enable";
signal: "enabled"; signal: "e,state,enabled";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "outline"; target: "outline";
target: "event"; target: "event";
target: "label"; target: "e.text.label";
} }
} }
} }
@ -251,7 +251,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
clip_to: "icon_clip"; clip_to: "icon_clip";
@ -277,7 +277,7 @@ group {
offset: 2 2; offset: 2 2;
} }
rel2 { rel2 {
to_y: "label"; to_y: "e.text.label";
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -2 -2; offset: -2 -2;
} }
@ -291,10 +291,10 @@ group {
state: "default" 0.0; state: "default" 0.0;
min: 16 16; min: 16 16;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
color: 255 255 255 255; color: 255 255 255 255;
} }
@ -305,7 +305,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -379,22 +379,22 @@ group {
programs { programs {
program { program {
name: "label_on"; name: "label_on";
signal: "label_visible"; signal: "e,state,labeled";
source: ""; source: "e";
action: STATE_SET "label_visible" 0.0; action: STATE_SET "label_visible" 0.0;
target: "icon_swallow"; target: "e.swallow.icon";
} }
program { program {
name: "turn_on1"; name: "turn_on1";
signal: "toggle_on"; signal: "e,state,checked";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "item1"; target: "item1";
} }
program { program {
name: "turn_off1"; name: "turn_off1";
signal: "toggle_off"; signal: "e,state,unchecked";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "item1"; target: "item1";
} }
@ -402,41 +402,41 @@ group {
name: "click"; name: "click";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "event"; source: "event";
action: SIGNAL_EMIT "toggled" "on"; action: SIGNAL_EMIT "e,action,toggle" ""; // XXX ,on?
} }
program { program {
name: "focus_in"; name: "focus_in";
signal: "focus_in"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.2; transition: DECELERATE 0.2;
target: "focus"; target: "focus";
} }
program { program {
name: "focus_out"; name: "focus_out";
signal: "focus_out"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.5; transition: ACCELERATE 0.5;
target: "focus"; target: "focus";
} }
program { program {
name: "disable"; name: "disable";
signal: "disabled"; signal: "e,state,disabled";
source: ""; source: "e";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;
target: "outline"; target: "outline";
target: "event"; target: "event";
target: "label"; target: "e.text.label";
} }
program { program {
name: "enable"; name: "enable";
signal: "enabled"; signal: "e,state,enabled";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "outline"; target: "outline";
target: "event"; target: "event";
target: "label"; target: "e.text.label";
} }
} }
} }

View File

@ -44,7 +44,7 @@ group {
} }
} }
part { part {
name: "content"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
clip_to: "content_clip"; clip_to: "content_clip";
@ -80,7 +80,7 @@ group {
name: "send_click"; name: "send_click";
signal: "mouse,clicked,1"; signal: "mouse,clicked,1";
source: "overlay"; source: "overlay";
action: SIGNAL_EMIT "click" ""; action: SIGNAL_EMIT "e,action,click" "";
} }
} }
} }

View File

@ -120,7 +120,7 @@ group {
} }
} }
part { part {
name: "item"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -139,7 +139,7 @@ group {
} }
} }
part { part {
name: "button"; name: "e.swallow.button";
type: SWALLOW; type: SWALLOW;
mouse_events: 1; mouse_events: 1;
description { description {
@ -148,7 +148,7 @@ group {
align: 0.5 1.0; align: 0.5 1.0;
fixed: 0 1; fixed: 0 1;
rel1 { rel1 {
to_y: "item"; to_y: "e.swallow.content";
relative: 0.5 1.0; relative: 0.5 1.0;
offset: 0 2; offset: 0 2;
} }
@ -314,7 +314,7 @@ group {
program { program {
name: "button_in"; name: "button_in";
signal: "mouse,in"; signal: "mouse,in";
source: "button"; source: "e.swallow.button";
script { script {
run_program(PROGRAM:"go_active"); run_program(PROGRAM:"go_active");
} }

View File

@ -382,7 +382,7 @@ group {
name: "next_governor"; name: "next_governor";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "cpu"; source: "cpu";
action: SIGNAL_EMIT "next_governor" "governor"; action: SIGNAL_EMIT "e,action,governor,next" "";
} }
program { program {
name: "next_governor2"; name: "next_governor2";
@ -402,7 +402,7 @@ group {
name: "increase_frequency"; name: "increase_frequency";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "increase"; source: "increase";
action: SIGNAL_EMIT "increase_frequency" "frequency"; action: SIGNAL_EMIT "e,action,frequency,increase" "";
} }
program { program {
name: "increase_frequency2"; name: "increase_frequency2";
@ -422,7 +422,7 @@ group {
name: "decrease_frequency"; name: "decrease_frequency";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "decrease"; source: "decrease";
action: SIGNAL_EMIT "decrease_frequency" "frequency"; action: SIGNAL_EMIT "e,action,frequency,decrease" "";
} }
program { program {
name: "decrease_frequency2"; name: "decrease_frequency2";
@ -440,15 +440,15 @@ group {
} }
program { program {
name: "enabled"; name: "enabled";
signal: "active"; signal: "e,state,enabled";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "fade_clip"; target: "fade_clip";
} }
program { program {
name: "disabled"; name: "disabled";
signal: "passive"; signal: "e,state,disabled";
source: ""; source: "e";
action: STATE_SET "faded" 0.0; action: STATE_SET "faded" 0.0;
target: "fade_clip"; target: "fade_clip";
} }

View File

@ -45,7 +45,7 @@ group {
} }
} }
part { part {
name: "content"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
clip_to: "content_clip"; clip_to: "content_clip";
@ -61,11 +61,11 @@ group {
} }
} }
part { part {
name: "cursor"; name: "e.dragable.cursor";
type: RECT; type: RECT;
clip_to: "content_clip"; clip_to: "content_clip";
dragable { dragable {
confine: "content"; confine: "e.swallow.content";
x: 1 1 0; x: 1 1 0;
y: -1 1 0; y: -1 1 0;
} }
@ -75,12 +75,12 @@ group {
max: 1 9999; max: 1 9999;
fixed: 1 1; fixed: 1 1;
rel1 { rel1 {
to: "content"; to: "e.swallow.content";
relative: 0.5 0; relative: 0.5 0;
offset: 0 0; offset: 0 0;
} }
rel2 { rel2 {
to: "content"; to: "e.swallow.content";
relative: 0.5 1; relative: 0.5 1;
offset: 0 -1; offset: 0 -1;
} }
@ -91,12 +91,12 @@ group {
max: 9999 1; max: 9999 1;
fixed: 1 1; fixed: 1 1;
rel1 { rel1 {
to: "content"; to: "e.swallow.content";
relative: 0 0.5 ; relative: 0 0.5 ;
offset: 0 0; offset: 0 0;
} }
rel2 { rel2 {
to: "content"; to: "e.swallow.content";
relative: 1 0.5; relative: 1 0.5;
offset: -1 0; offset: -1 0;
} }
@ -123,10 +123,10 @@ group {
programs { programs {
program { program {
name: "go_vertical"; name: "go_vertical";
signal: "e,direction,v"; signal: "e,state,direction,v";
source: ""; source: "e";
action: STATE_SET "vertical" 0.0; action: STATE_SET "vertical" 0.0;
target: "cursor"; target: "e.dragable.cursor";
target: "background"; target: "background";
} }
} }

View File

@ -57,7 +57,7 @@ group
} }
part part
{ {
name: "title"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
description { description {
@ -112,7 +112,7 @@ group
} }
part part
{ {
name: "passwd"; name: "e.text.password";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
clip_to: "passwd_entry_clip"; clip_to: "passwd_entry_clip";
@ -161,12 +161,12 @@ group
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 0 -2; offset: 0 -2;
to: "passwd"; to: "e.text.password";
} }
rel2 { rel2 {
relative: 1.0 0.9; relative: 1.0 0.9;
offset: 0 0; offset: 0 0;
to: "passwd"; to: "e.text.password";
} }
image { image {
normal: "e17_entry_cursor.png"; normal: "e17_entry_cursor.png";

View File

@ -81,7 +81,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -95,12 +95,12 @@ group {
rel2 { rel2 {
relative: 0.0 0.0; relative: 0.0 0.0;
offset: 16 -9; offset: 16 -9;
to_y: "buttons_swallow"; to_y: "e.swallow.buttons";
} }
} }
} }
part { part {
name: "content_swallow"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -108,12 +108,12 @@ group {
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 8 16; offset: 8 16;
to_x: "icon_swallow"; to_x: "e.swallow.icon";
} }
rel2 { rel2 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -17 -9; offset: -17 -9;
to_y: "buttons_swallow"; to_y: "e.swallow.buttons";
} }
} }
} }
@ -125,7 +125,7 @@ group {
rel1 { rel1 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 1 -3; offset: 1 -3;
to_y: "content_swallow"; to_y: "e.swallow.content";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
@ -141,7 +141,7 @@ group {
} }
} }
part { part {
name: "buttons_swallow"; name: "e.swallow.buttons";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -165,7 +165,7 @@ group {
name: "widgets/dialog/text"; name: "widgets/dialog/text";
parts { parts {
part { part {
name: "text"; name: "e.textblock.message";
type: TEXTBLOCK; type: TEXTBLOCK;
mouse_events: 0; mouse_events: 0;
description { description {

View File

@ -39,7 +39,7 @@ group {
} }
} }
part { part {
name: "text_area"; name: "e.swallow.text";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -80,7 +80,7 @@ group {
name: "widgets/entry/text"; name: "widgets/entry/text";
parts { parts {
part { part {
name: "text"; name: "e.text.text";
type: TEXT; type: TEXT;
mouse_events: 0; mouse_events: 0;
description { description {
@ -121,8 +121,8 @@ group {
programs { programs {
program { program {
name: "on_cursor_show"; name: "on_cursor_show";
signal: "cursor_show"; signal: "e,action,show,cursor";
source: ""; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "cursor_show"; target: "cursor_show";
target: "cursor_hide"; target: "cursor_hide";

View File

@ -104,7 +104,7 @@ group {
} }
} }
part { part {
name: "title"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -133,7 +133,7 @@ group {
} }
} }
part { part {
name: "text"; name: "e.text.message";
type: TEXTBLOCK; type: TEXTBLOCK;
mouse_events: 0; mouse_events: 0;
description { description {
@ -242,7 +242,7 @@ group {
} }
program { program {
name: "button_unclick2"; name: "button_unclick2";
action: SIGNAL_EMIT "close" ""; action: SIGNAL_EMIT "e,action,close" "";
} }
} }
} }

View File

@ -80,7 +80,7 @@ group {
} }
part { part {
name: "eap_list_swallow"; name: "e.swallow.eap_list";
type: SWALLOW; type: SWALLOW;
clip_to: "eap_list_clip"; clip_to: "eap_list_clip";
description { description {
@ -95,7 +95,7 @@ group {
rel2 { rel2 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -17 -17; offset: -17 -17;
to_y: "label"; to_y: "e.text.label";
} }
} }
} }
@ -108,12 +108,12 @@ group {
rel1 { rel1 {
relative: 0.0 0.0; relative: 0.0 0.0;
offset: 0 0; offset: 0 0;
to_y: "eap_list_swallow"; to_y: "e.swallow.eap_list";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -1 -1; offset: -1 -1;
to_y: "eap_list_swallow"; to_y: "e.swallow.eap_list";
} }
} }
} }
@ -129,7 +129,7 @@ group {
rel2 { rel2 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -2 16; offset: -2 16;
to_y: "eap_list_swallow"; to_y: "e.swallow.eap_list";
} }
image { image {
normal: "e17_winlist_top.png"; normal: "e17_winlist_top.png";
@ -148,12 +148,12 @@ group {
rel1 { rel1 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 1 -3; offset: 1 -3;
to_y: "eap_list_swallow"; to_y: "e.swallow.eap_list";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -2 16; offset: -2 16;
to_y: "label"; to_y: "e.text.label";
} }
image { image {
normal: "e17_winlist_bottom.png"; normal: "e17_winlist_bottom.png";
@ -166,7 +166,7 @@ group {
} }
part { part {
name: "exe_list_swallow"; name: "e.swallow.exe_list";
type: SWALLOW; type: SWALLOW;
clip_to: "exe_list_clip"; clip_to: "exe_list_clip";
description { description {
@ -177,7 +177,7 @@ group {
rel1 { rel1 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 16 16; offset: 16 16;
to_y: "label"; to_y: "e.text.label";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
@ -194,12 +194,12 @@ group {
rel1 { rel1 {
relative: 0.0 0.0; relative: 0.0 0.0;
offset: 0 0; offset: 0 0;
to_y: "exe_list_swallow"; to_y: "e.swallow.exe_list";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -1 -1; offset: -1 -1;
to_y: "exe_list_swallow"; to_y: "e.swallow.exe_list";
} }
} }
} }
@ -211,12 +211,12 @@ group {
rel1 { rel1 {
relative: 0.0 0.0; relative: 0.0 0.0;
offset: 1 -15; offset: 1 -15;
to_y: "label"; to_y: "e.text.label";
} }
rel2 { rel2 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -2 16; offset: -2 16;
to_y: "exe_list_swallow"; to_y: "e.swallow.exe_list";
} }
image { image {
normal: "e17_winlist_top.png"; normal: "e17_winlist_top.png";
@ -235,7 +235,7 @@ group {
rel1 { rel1 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 1 -3; offset: 1 -3;
to_y: "exe_list_swallow"; to_y: "e.swallow.exe_list";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
@ -253,7 +253,7 @@ group {
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
description { description {
@ -264,12 +264,12 @@ group {
rel1 { rel1 {
relative: 1.0 0.5; relative: 1.0 0.5;
offset: 16 0; offset: 16 0;
to_x: "icon_swallow"; to_x: "e.swallow.icons";
} }
rel2 { rel2 {
relative: 1.0 0.5; relative: 1.0 0.5;
offset: 16 0; offset: 16 0;
to_x: "icon_swallow"; to_x: "e.swallow.icons";
} }
color: 0 0 0 255; color: 0 0 0 255;
color3: 255 255 255 128; color3: 255 255 255 128;
@ -295,12 +295,12 @@ group {
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 3 0; offset: 3 0;
to: "label"; to: "e.text.label";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 3 -1; offset: 3 -1;
to: "label"; to: "e.text.label";
} }
image { image {
normal: "e17_entry_cursor.png"; normal: "e17_entry_cursor.png";
@ -308,7 +308,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icons";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -319,12 +319,12 @@ group {
rel1 { rel1 {
relative: 0.0 0.0; relative: 0.0 0.0;
offset: 16 -7; offset: 16 -7;
to_y: "label"; to_y: "e.text.label";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 16 8; offset: 16 8;
to_y: "label"; to_y: "e.text.label";
} }
} }
} }
@ -334,12 +334,12 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icons";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -8 -8; offset: -8 -8;
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icons";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 7 7; offset: 7 7;
} }
@ -365,7 +365,7 @@ group {
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 1 -1; offset: 1 -1;
to_x: "icon_swallow"; to_x: "e.swallow.icons";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
@ -543,15 +543,15 @@ group {
offset: 0 6; offset: 0 6;
} }
text { text {
text_source: "title_text"; text_source: "e.text.title";
source: "title_text"; source: "e.text.title";
min: 0 1; min: 0 1;
text_class: "title_bar"; text_class: "title_bar";
} }
} }
} }
part { part {
name: "title_text"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -560,7 +560,7 @@ group {
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 9 6; offset: 9 6;
to_x: "icon_swallow"; to_x: "e.swallow.icons";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
@ -744,7 +744,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icons";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -767,8 +767,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -844,8 +844,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";

View File

@ -183,12 +183,12 @@ group {
visible: 0; visible: 0;
align: 0.5 0.5; align: 0.5 0.5;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -1 -1; offset: -1 -1;
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 0 0; offset: 0 0;
} }
@ -307,7 +307,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -323,7 +323,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -528,8 +528,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -603,8 +603,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -633,8 +633,8 @@ group {
} }
program { program {
name: "thumb_gen"; name: "thumb_gen";
signal: "thumb"; signal: "e,action,thumb,gen";
source: "gen"; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
target: "icon_box_shadow"; target: "icon_box_shadow";
target: "icon_box"; target: "icon_box";
@ -643,8 +643,8 @@ group {
} }
program { program {
name: "thumb_gen-"; name: "thumb_gen-";
signal: "thumb"; signal: "e,action,thumb,gen,alpha";
source: "gen_alpha"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "icon_box_shadow"; target: "icon_box_shadow";
target: "icon_box"; target: "icon_box";
@ -858,12 +858,12 @@ group {
visible: 0; visible: 0;
align: 0.5 0.5; align: 0.5 0.5;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -1 -1; offset: -1 -1;
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 0 0; offset: 0 0;
} }
@ -982,7 +982,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -998,7 +998,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -1203,8 +1203,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -1278,8 +1278,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -1308,8 +1308,8 @@ group {
} }
program { program {
name: "thumb_gen"; name: "thumb_gen";
signal: "thumb"; signal: "e,action,thumb,gen";
source: "gen"; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
target: "icon_box_shadow"; target: "icon_box_shadow";
target: "icon_box"; target: "icon_box";
@ -1318,8 +1318,8 @@ group {
} }
program { program {
name: "thumb_gen-"; name: "thumb_gen-";
signal: "thumb"; signal: "e,action,thumb,gen,alpha";
source: "gen_alpha"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "icon_box_shadow"; target: "icon_box_shadow";
target: "icon_box"; target: "icon_box";
@ -1533,12 +1533,12 @@ group {
visible: 0; visible: 0;
align: 0.5 0.5; align: 0.5 0.5;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -1 -1; offset: -1 -1;
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 0 0; offset: 0 0;
} }
@ -1656,7 +1656,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -1672,7 +1672,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -1877,8 +1877,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -1952,8 +1952,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -1982,8 +1982,8 @@ group {
} }
program { program {
name: "thumb_gen"; name: "thumb_gen";
signal: "thumb"; signal: "e,action,thumb,gen";
source: "gen"; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
target: "icon_box_shadow"; target: "icon_box_shadow";
target: "icon_box"; target: "icon_box";
@ -1992,8 +1992,8 @@ group {
} }
program { program {
name: "thumb_gen-"; name: "thumb_gen-";
signal: "thumb"; signal: "e,action,thumb,gen,alpha";
source: "gen_alpha"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "icon_box_shadow"; target: "icon_box_shadow";
target: "icon_box"; target: "icon_box";
@ -2207,12 +2207,12 @@ group {
visible: 0; visible: 0;
align: 0.5 0.5; align: 0.5 0.5;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -1 -1; offset: -1 -1;
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 0 0; offset: 0 0;
} }
@ -2331,7 +2331,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -2347,7 +2347,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -2552,8 +2552,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -2627,8 +2627,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -2657,8 +2657,8 @@ group {
} }
program { program {
name: "thumb_gen"; name: "thumb_gen";
signal: "thumb"; signal: "e,action,thumb,gen";
source: "gen"; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
target: "icon_box_shadow"; target: "icon_box_shadow";
target: "icon_box"; target: "icon_box";
@ -2667,8 +2667,8 @@ group {
} }
program { program {
name: "thumb_gen-"; name: "thumb_gen-";
signal: "thumb"; signal: "e,action,thumb,gen,alpha";
source: "gen_alpha"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "icon_box_shadow"; target: "icon_box_shadow";
target: "icon_box"; target: "icon_box";
@ -2740,7 +2740,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -2752,14 +2752,14 @@ group {
offset: 4 4; offset: 4 4;
} }
rel2 { rel2 {
to_y: "label"; to_y: "e.text.label";
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -5 -2; offset: -5 -2;
} }
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -2801,19 +2801,19 @@ group {
programs { programs {
program { program {
name: "active"; name: "active";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "label"; target: "e.text.label";
target: "icon_overlay"; target: "icon_overlay";
} }
program { program {
name: "passive"; name: "passive";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: LINEAR 0.2; transition: LINEAR 0.2;
target: "label"; target: "e.text.label";
target: "icon_overlay"; target: "icon_overlay";
} }
} }
@ -2848,7 +2848,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -2860,14 +2860,14 @@ group {
offset: 4 4; offset: 4 4;
} }
rel2 { rel2 {
to_y: "label"; to_y: "e.text.label";
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -5 -2; offset: -5 -2;
} }
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -2909,19 +2909,19 @@ group {
programs { programs {
program { program {
name: "active"; name: "active";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "label"; target: "e.text.label";
target: "icon_overlay"; target: "icon_overlay";
} }
program { program {
name: "passive"; name: "passive";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: LINEAR 0.2; transition: LINEAR 0.2;
target: "label"; target: "e.text.label";
target: "icon_overlay"; target: "icon_overlay";
} }
} }
@ -2962,7 +2962,7 @@ group {
} }
} }
part { part {
name: "busy_label"; name: "e.text.busy_label";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
clip_to: "busy_clip"; clip_to: "busy_clip";
@ -3011,16 +3011,16 @@ group {
programs { programs {
program { program {
name: "go1"; name: "go1";
signal: "busy"; signal: "e,state,busy,start";
source: "start"; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "busy_clip"; target: "busy_clip";
} }
program { program {
name: "go2"; name: "go2";
signal: "busy"; signal: "e,state,busy,start";
source: "start"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "busy"; target: "busy";
@ -3028,8 +3028,8 @@ group {
} }
program { program {
name: "stop1"; name: "stop1";
signal: "busy"; signal: "e,state,busy,stop";
source: "stop"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "busy_clip"; target: "busy_clip";
@ -4229,7 +4229,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -4435,7 +4435,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -4495,7 +4495,7 @@ group {
name: "fileman/icon_list"; name: "fileman/icon_list";
parts { parts {
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -4519,7 +4519,7 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to_x: "icon_swallow"; to_x: "e.swallow.icon";
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 2 2; offset: 2 2;
} }
@ -4555,7 +4555,7 @@ group {
effect: NONE; effect: NONE;
description { description {
rel1 { rel1 {
to_x: "icon_swallow"; to_x: "e.swallow.icon";
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 2 2; offset: 2 2;
} }

View File

@ -1,3 +1,5 @@
/* this file looks like its deprecated and should probably be removed */
images { images {
image: "e17_ibar_bg_h.png" COMP; image: "e17_ibar_bg_h.png" COMP;
image: "e17_ibar_over_h.png" COMP; image: "e17_ibar_over_h.png" COMP;

View File

@ -7,7 +7,7 @@ group {
name: "widgets/frame"; name: "widgets/frame";
parts { parts {
part { part {
name: "items"; name: "e.swallow.content";
mouse_events: 0; mouse_events: 0;
type: SWALLOW; type: SWALLOW;
description { description {
@ -32,7 +32,7 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to_y: "label"; to_y: "e.text.label";
relative: 0.0 0.5; relative: 0.0 0.5;
offset: 2 -1; offset: 2 -1;
} }
@ -75,7 +75,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
mouse_events: 0; mouse_events: 0;
description { description {
@ -107,12 +107,12 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "label"; to: "e.text.label";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -5 -4; offset: -5 -4;
} }
rel2 { rel2 {
to: "label"; to: "e.text.label";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 2 2; offset: 2 2;
} }

View File

@ -85,16 +85,16 @@ group {
} }
program { program {
name: "exec_start"; name: "exec_start";
signal: "start"; signal: "e,action,start";
source: ""; source: "e";
action: STATE_SET "faded" 0.0; action: STATE_SET "faded" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "item_clip"; target: "item_clip";
} }
program { program {
name: "exec_exec"; name: "exec_exec";
signal: "exec"; signal: "e,action,exec";
source: ""; source: "e";
action: STATE_SET "faded" 0.0; action: STATE_SET "faded" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "item_clip"; target: "item_clip";
@ -102,8 +102,8 @@ group {
} }
program { program {
name: "exec_stop"; name: "exec_stop";
signal: "stop"; signal: "e,action,stop";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "item_clip"; target: "item_clip";
} }
@ -195,7 +195,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
mouse_events: 0; mouse_events: 0;
@ -240,19 +240,19 @@ group {
programs { programs {
program { program {
name: "go_active"; name: "go_active";
signal: "active"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
target: "background"; target: "background";
after: "go_active2"; after: "go_active2";
} }
program { program {
name: "go_activeB"; name: "go_activeB";
signal: "label_active"; signal: "e,action,show,label";
source: ""; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 0.5; transition: SINUSOIDAL 0.5;
target: "label"; target: "e.text.label";
} }
program { program {
name: "go_active2"; name: "go_active2";
@ -265,8 +265,8 @@ group {
} }
program { program {
name: "go_passive"; name: "go_passive";
signal: "passive"; signal: "e,state,unfocused";
source: ""; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "go_active"; target: "go_active";
target: "go_active2"; target: "go_active2";
@ -274,11 +274,11 @@ group {
} }
program { program {
name: "go_passiveB"; name: "go_passiveB";
signal: "label_passive"; signal: "e,action,hide,label";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "label"; target: "e.text.label";
} }
program { program {
name: "go_passive2"; name: "go_passive2";
@ -301,8 +301,8 @@ group {
} }
program { program {
name: "exec_start"; name: "exec_start";
signal: "start"; signal: "e,action,start";
source: ""; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "go_active"; target: "go_active";
target: "go_active2"; target: "go_active2";
@ -314,14 +314,14 @@ group {
} }
program { program {
name: "exec_exec"; name: "exec_exec";
signal: "exec"; signal: "e,action,exec";
source: ""; source: "e";
after: "exec_start"; after: "exec_start";
} }
program { program {
name: "exec_stop"; name: "exec_stop";
signal: "stop"; signal: "e,action,stop";
source: ""; source: "e";
// action: SIGNAL_EMIT "active" 0.0; // action: SIGNAL_EMIT "active" 0.0;
} }
} }

View File

@ -27,7 +27,7 @@ group {
} }
} }
part { part {
name: "item"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
clip_to: "item_clip"; clip_to: "item_clip";
@ -73,7 +73,7 @@ group {
source: "over"; source: "over";
action: STATE_SET "bigger" 0.0; action: STATE_SET "bigger" 0.0;
transition: LINEAR 0.1; transition: LINEAR 0.1;
target: "item"; target: "e.swallow.content";
} }
program { program {
name: "hover_out"; name: "hover_out";
@ -81,20 +81,20 @@ group {
source: "over"; source: "over";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: LINEAR 0.2; transition: LINEAR 0.2;
target: "item"; target: "e.swallow.content";
} }
program { program {
name: "exec_start"; name: "exec_start";
signal: "start"; signal: "e,action,start";
source: ""; source: "e";
action: STATE_SET "faded" 0.0; action: STATE_SET "faded" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "item_clip"; target: "item_clip";
} }
program { program {
name: "exec_exec"; name: "exec_exec";
signal: "exec"; signal: "e,action,exec";
source: ""; source: "e";
action: STATE_SET "faded" 0.0; action: STATE_SET "faded" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "item_clip"; target: "item_clip";
@ -102,8 +102,8 @@ group {
} }
program { program {
name: "exec_stop"; name: "exec_stop";
signal: "stop"; signal: "e,action,stop";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "item_clip"; target: "item_clip";
} }
@ -179,7 +179,7 @@ group {
} }
} }
part { part {
name: "item"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
clip_to: "background"; clip_to: "background";
@ -195,7 +195,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
mouse_events: 0; mouse_events: 0;
@ -240,19 +240,19 @@ group {
programs { programs {
program { program {
name: "go_active"; name: "go_active";
signal: "active"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
target: "background"; target: "background";
after: "go_active2"; after: "go_active2";
} }
program { program {
name: "go_activeB"; name: "go_activeB";
signal: "label_active"; signal: "e,action,show,label";
source: ""; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 0.5; transition: SINUSOIDAL 0.5;
target: "label"; target: "e.text.label";
} }
program { program {
name: "go_active2"; name: "go_active2";
@ -265,8 +265,8 @@ group {
} }
program { program {
name: "go_passive"; name: "go_passive";
signal: "passive"; signal: "e,state,unfocused";
source: ""; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "go_active"; target: "go_active";
target: "go_active2"; target: "go_active2";
@ -274,11 +274,11 @@ group {
} }
program { program {
name: "go_passiveB"; name: "go_passiveB";
signal: "label_passive"; signal: "e,action,hide,label";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "label"; target: "e.text.label";
} }
program { program {
name: "go_passive2"; name: "go_passive2";
@ -301,8 +301,8 @@ group {
} }
program { program {
name: "exec_start"; name: "exec_start";
signal: "start"; signal: "e,action,start";
source: ""; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "go_active"; target: "go_active";
target: "go_active2"; target: "go_active2";
@ -314,14 +314,14 @@ group {
} }
program { program {
name: "exec_exec"; name: "exec_exec";
signal: "exec"; signal: "e,action,exec";
source: ""; source: "e";
after: "exec_start"; after: "exec_start";
} }
program { program {
name: "exec_stop"; name: "exec_stop";
signal: "stop"; signal: "e,action,stop";
source: ""; source: "e";
// action: SIGNAL_EMIT "active" 0.0; // action: SIGNAL_EMIT "active" 0.0;
} }
} }

View File

@ -115,16 +115,16 @@ group {
programs { programs {
program { program {
name: "e_in"; name: "e_in";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "hilited" 0.0; action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "e_glow"; target: "e_glow";
} }
program { program {
name: "e_out"; name: "e_out";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "e_glow"; target: "e_glow";
@ -176,16 +176,16 @@ group {
programs { programs {
program { program {
name: "power_button_in"; name: "power_button_in";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "hilited" 0.0; action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "power_button_glow"; target: "power_button_glow";
} }
program { program {
name: "power_button_out"; name: "power_button_out";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "power_button_glow"; target: "power_button_glow";
@ -237,16 +237,16 @@ group {
programs { programs {
program { program {
name: "reset_button_in"; name: "reset_button_in";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "hilited" 0.0; action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "reset_button_glow"; target: "reset_button_glow";
} }
program { program {
name: "reset_button_out"; name: "reset_button_out";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "reset_button_glow"; target: "reset_button_glow";
@ -469,16 +469,16 @@ group {
programs { programs {
program { program {
name: "fileman_button_in"; name: "fileman_button_in";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "hilited" 0.0; action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "fileman_button_glow"; target: "fileman_button_glow";
} }
program { program {
name: "fileman_button_out"; name: "fileman_button_out";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: LINEAR 0.5; transition: LINEAR 0.5;
target: "fileman_button_glow"; target: "fileman_button_glow";
@ -1385,9 +1385,10 @@ group {
} }
gradient { gradient {
spectrum: "black_to_trans"; spectrum: "black_to_trans";
} rel1.relative: 0 0.5;
fill { rel1.offset: 0 0;
angle: 270; rel2.relative: 1 0.5;
rel2.offset: -1 0;
} }
} }
} }
@ -1427,9 +1428,6 @@ group {
gradient { gradient {
spectrum: "black_to_trans"; spectrum: "black_to_trans";
} }
fill {
angle: 0;
}
} }
} }
part { part {
@ -1467,9 +1465,10 @@ group {
} }
gradient { gradient {
spectrum: "black_to_trans"; spectrum: "black_to_trans";
} rel1.relative: 0 1;
fill { rel1.offset: 0 -1;
angle: 225; rel2.relative: 1 0;
rel2.offset: -1 0;
} }
} }
} }
@ -1508,9 +1507,10 @@ group {
} }
gradient { gradient {
spectrum: "black_to_trans"; spectrum: "black_to_trans";
} rel1.relative: 0 0;
fill { rel1.offset: 0 0;
angle: 315; rel2.relative: 1 1;
rel2.offset: -1 -1;
} }
} }
} }

View File

@ -138,7 +138,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -158,7 +158,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -166,7 +166,7 @@ group {
state: "default" 0.0; state: "default" 0.0;
min: 16 16; min: 16 16;
rel1 { rel1 {
to_x: "icon_swallow"; to_x: "e.swallow.icon";
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 4 4; offset: 4 4;
} }
@ -363,8 +363,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -438,8 +438,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -605,7 +605,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -625,7 +625,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -633,7 +633,7 @@ group {
state: "default" 0.0; state: "default" 0.0;
min: 16 16; min: 16 16;
rel1 { rel1 {
to_x: "icon_swallow"; to_x: "e.swallow.icon";
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 4 4; offset: 4 4;
} }
@ -830,8 +830,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -905,8 +905,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -952,7 +952,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -972,7 +972,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
mouse_events: 0; mouse_events: 0;
@ -980,7 +980,7 @@ group {
state: "default" 0.0; state: "default" 0.0;
min: 16 16; min: 16 16;
rel1 { rel1 {
to_x: "icon_swallow"; to_x: "e.swallow.icon";
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 16 4; offset: 16 4;
} }

View File

@ -2,7 +2,7 @@ group {
name: "widgets/label"; name: "widgets/label";
parts { parts {
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;

View File

@ -80,7 +80,7 @@ group {
} }
} }
part { part {
name: "title"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
mouse_events: 0; mouse_events: 0;
@ -127,13 +127,13 @@ group {
} }
} }
part { part {
name: "items"; name: "e.swallow.content";
mouse_events: 0; mouse_events: 0;
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to_y: "title"; to_y: "e.text.title";
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 1 0; offset: 1 0;
} }
@ -148,17 +148,17 @@ group {
programs { programs {
program { program {
name: "on"; name: "on";
signal: "title,on"; signal: "e,action,show,title";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title"; target: "e.text.title";
} }
program { program {
name: "off"; name: "off";
signal: "title,off"; signal: "e,action,hide,title";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title"; target: "e.text.title";
} }
} }
} }
@ -194,7 +194,7 @@ group {
name: "widgets/menu/default/item_bg"; name: "widgets/menu/default/item_bg";
parts { parts {
part { part {
name: "item"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -215,7 +215,7 @@ group {
name: "widgets/menu/default/submenu_bg"; name: "widgets/menu/default/submenu_bg";
parts { parts {
part { part {
name: "item"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -301,15 +301,15 @@ group {
programs { programs {
program { program {
name: "turn_on1"; name: "turn_on1";
signal: "toggle_on"; signal: "e,state,on";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "item1"; target: "item1";
} }
program { program {
name: "turn_off1"; name: "turn_off1";
signal: "toggle_off"; signal: "e,state,off";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "item1"; target: "item1";
} }
@ -384,15 +384,15 @@ group {
programs { programs {
program { program {
name: "turn_on1"; name: "turn_on1";
signal: "toggle_on"; signal: "e,state,on";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "item1"; target: "item1";
} }
program { program {
name: "turn_off1"; name: "turn_off1";
signal: "toggle_off"; signal: "e,state,off";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "item1"; target: "item1";
} }
@ -402,7 +402,7 @@ group {
name: "widgets/menu/default/icon"; name: "widgets/menu/default/icon";
parts { parts {
part { part {
name: "item"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -608,7 +608,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -803,8 +803,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -880,8 +880,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";

View File

@ -69,7 +69,7 @@ group {
} }
} }
part { part {
name: "text"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
description { description {

View File

@ -501,8 +501,8 @@ group {
programs { programs {
program { program {
name: "go_active3b"; name: "go_active3b";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_glint_1"; target: "title_glint_1";
target: "title_glint_2"; target: "title_glint_2";
@ -546,8 +546,8 @@ group {
} }
program { program {
name: "go_active_content"; name: "go_active_content";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
transition: SINUSOIDAL 0.25; transition: SINUSOIDAL 0.25;
target: "clip"; target: "clip";
@ -556,8 +556,8 @@ group {
} }
program { program {
name: "go_passive"; name: "go_passive";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "clip"; target: "clip";
@ -566,24 +566,24 @@ group {
} }
program { program {
name: "set_active"; name: "set_active";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
script { script {
set_int(active, 1); set_int(active, 1);
} }
} }
program { program {
name: "set_passive"; name: "set_passive";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
script { script {
set_int(active, 0); set_int(active, 0);
} }
} }
program { program {
name: "drag_in"; name: "drag_in";
signal: "drag"; signal: "e,action,drag,in";
source: "in"; source: "e";
script { script {
if (get_int(drag) == 0) { if (get_int(drag) == 0) {
set_state(PART:"overlay", "drag", 0.0); set_state(PART:"overlay", "drag", 0.0);
@ -593,8 +593,8 @@ group {
} }
program { program {
name: "drag_out"; name: "drag_out";
signal: "drag"; signal: "e,action,drag,out";
source: "out"; source: "e";
script { script {
if (get_int(drag) == 1) { if (get_int(drag) == 1) {
if (get_int(active) == 1) if (get_int(active) == 1)

View File

@ -33,7 +33,7 @@ group {
*/ */
} }
part { part {
name: "hotspot"; name: "e.swallow.hotspot";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {

View File

@ -12,11 +12,11 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "item"; to: "e.swallow.content";
offset: -3 -3; offset: -3 -3;
} }
rel2 { rel2 {
to: "item"; to: "e.swallow.content";
offset: 2 2; offset: 2 2;
} }
image { image {
@ -35,15 +35,15 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "item"; to: "e.swallow.content";
} }
rel2 { rel2 {
to: "item"; to: "e.swallow.content";
} }
} }
} }
part { part {
name: "item"; name: "e.swallow.content";
clip_to: "clipper"; clip_to: "clipper";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;

View File

@ -63,7 +63,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -137,15 +137,15 @@ group {
programs { programs {
program { program {
name: "turn_on1"; name: "turn_on1";
signal: "toggle_on"; signal: "e,state,on";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "item1"; target: "item1";
} }
program { program {
name: "turn_off1"; name: "turn_off1";
signal: "toggle_off"; signal: "e,state,off";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "item1"; target: "item1";
} }
@ -153,41 +153,41 @@ group {
name: "click"; name: "click";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "event"; source: "event";
action: SIGNAL_EMIT "toggled" "on"; action: SIGNAL_EMIT "e,action,toggle" "";
} }
program { program {
name: "focus_in"; name: "focus_in";
signal: "focus_in"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.2; transition: DECELERATE 0.2;
target: "focus"; target: "focus";
} }
program { program {
name: "focus_out"; name: "focus_out";
signal: "focus_out"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.5; transition: ACCELERATE 0.5;
target: "focus"; target: "focus";
} }
program { program {
name: "disable"; name: "disable";
signal: "disabled"; signal: "e,state,disabled";
source: ""; source: "e";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;
target: "outline"; target: "outline";
target: "event"; target: "event";
target: "label"; target: "e.text.label";
} }
program { program {
name: "enable"; name: "enable";
signal: "enabled"; signal: "e,state,enabled";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "outline"; target: "outline";
target: "event"; target: "event";
target: "label"; target: "e.text.label";
} }
} }
} }
@ -251,7 +251,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
clip_to: "icon_clip"; clip_to: "icon_clip";
@ -277,7 +277,7 @@ group {
offset: 2 2; offset: 2 2;
} }
rel2 { rel2 {
to_y: "label"; to_y: "e.text.label";
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -2 -2; offset: -2 -2;
} }
@ -291,10 +291,10 @@ group {
state: "default" 0.0; state: "default" 0.0;
min: 16 16; min: 16 16;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
} }
color: 255 255 255 255; color: 255 255 255 255;
} }
@ -318,7 +318,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -393,23 +393,23 @@ group {
programs { programs {
program { program {
name: "label_on"; name: "label_on";
signal: "label_visible"; signal: "e,state,labeled";
source: ""; source: "e";
action: STATE_SET "label_visible" 0.0; action: STATE_SET "label_visible" 0.0;
target: "icon_swallow"; target: "e.swallow.icon";
target: "label_clip"; target: "label_clip";
} }
program { program {
name: "turn_on1"; name: "turn_on1";
signal: "toggle_on"; signal: "e,state,on";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "item1"; target: "item1";
} }
program { program {
name: "turn_off1"; name: "turn_off1";
signal: "toggle_off"; signal: "e,state,off";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "item1"; target: "item1";
} }
@ -417,42 +417,42 @@ group {
name: "click"; name: "click";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "event"; source: "event";
action: SIGNAL_EMIT "toggled" "on"; action: SIGNAL_EMIT "e,action,toggle" "";
} }
program { program {
name: "focus_in"; name: "focus_in";
signal: "focus_in"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.2; transition: DECELERATE 0.2;
target: "focus"; target: "focus";
} }
program { program {
name: "focus_out"; name: "focus_out";
signal: "focus_out"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.5; transition: ACCELERATE 0.5;
target: "focus"; target: "focus";
} }
program { program {
name: "disable"; name: "disable";
signal: "disabled"; signal: "e,state,disabled";
source: ""; source: "e";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;
target: "outline"; target: "outline";
target: "event"; target: "event";
target: "label"; target: "e.text.label";
target: "icon_clip"; target: "icon_clip";
} }
program { program {
name: "enable"; name: "enable";
signal: "enabled"; signal: "e,state,enabled";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "outline"; target: "outline";
target: "event"; target: "event";
target: "label"; target: "e.text.label";
target: "icon_clip"; target: "icon_clip";
} }
} }

View File

@ -69,7 +69,7 @@ group {
} }
} }
part { part {
name: "text"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
description { description {

View File

@ -188,7 +188,7 @@ group {
rel2 { rel2 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -1 -1; offset: -1 -1;
to: "vbar_bar"; to: "e.dragable.vbar";
} }
} }
} }
@ -203,7 +203,7 @@ group {
rel1 { rel1 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 0 0; offset: 0 0;
to: "vbar_bar"; to: "e.dragable.vbar";
} }
rel2 { rel2 {
relative: 1.0 0.0; relative: 1.0 0.0;
@ -213,7 +213,7 @@ group {
} }
} }
part { part {
name: "vbar_bar"; name: "e.dragable.vbar";
clip_to: "sb_vbar"; clip_to: "sb_vbar";
mouse_events: 1; mouse_events: 1;
dragable { dragable {
@ -256,10 +256,10 @@ group {
max: 8 8; max: 8 8;
min: 8 8; min: 8 8;
rel1 { rel1 {
to: "vbar_bar"; to: "e.dragable.vbar";
} }
rel2 { rel2 {
to: "vbar_bar"; to: "e.dragable.vbar";
} }
image { image {
normal: "e17_scrollbar_vdrag_thumb.png"; normal: "e17_scrollbar_vdrag_thumb.png";
@ -424,7 +424,7 @@ group {
rel2 { rel2 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: -1 -1; offset: -1 -1;
to: "hbar_bar"; to: "e.dragable.hbar";
} }
} }
} }
@ -439,7 +439,7 @@ group {
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 0 0; offset: 0 0;
to: "hbar_bar"; to: "e.dragable.hbar";
} }
rel2 { rel2 {
relative: 0.0 1.0; relative: 0.0 1.0;
@ -449,7 +449,7 @@ group {
} }
} }
part { part {
name: "hbar_bar"; name: "e.dragable.hbar";
clip_to: "sb_hbar"; clip_to: "sb_hbar";
mouse_events: 1; mouse_events: 1;
dragable { dragable {
@ -492,10 +492,10 @@ group {
max: 8 8; max: 8 8;
min: 8 8; min: 8 8;
rel1 { rel1 {
to: "hbar_bar"; to: "e.dragable.hbar";
} }
rel2 { rel2 {
to: "hbar_bar"; to: "e.dragable.hbar";
} }
image { image {
normal: "e17_scrollbar_hdrag_thumb.png"; normal: "e17_scrollbar_hdrag_thumb.png";
@ -593,29 +593,29 @@ group {
programs { programs {
program { program {
name: "sb_vbar_show"; name: "sb_vbar_show";
signal: "vbar"; signal: "e,action,show,vbar";
source: "show"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "sb_vbar"; target: "sb_vbar";
} }
program { program {
name: "sb_vbar_hide"; name: "sb_vbar_hide";
signal: "vbar"; signal: "e,action,hide,vbar";
source: "hide"; source: "e";
action: STATE_SET "hidden" 0.0; action: STATE_SET "hidden" 0.0;
target: "sb_vbar"; target: "sb_vbar";
} }
program { program {
name: "sb_hbar_show"; name: "sb_hbar_show";
signal: "hbar"; signal: "e,action,show,hbar";
source: "show"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "sb_hbar"; target: "sb_hbar";
} }
program { program {
name: "sb_hbar_hide"; name: "sb_hbar_hide";
signal: "hbar"; signal: "e,action,hide,hbar";
source: "hide"; source: "e";
action: STATE_SET "hidden" 0.0; action: STATE_SET "hidden" 0.0;
target: "sb_hbar"; target: "sb_hbar";
} }
@ -632,7 +632,7 @@ group {
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sb_vbar_a1"; source: "sb_vbar_a1";
action: DRAG_VAL_STEP 0.0 -1.0; action: DRAG_VAL_STEP 0.0 -1.0;
target: "vbar_bar"; target: "e.dragable.vbar";
} }
program { program {
name: "sb_vbar_a1_up"; name: "sb_vbar_a1_up";
@ -653,7 +653,7 @@ group {
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sb_vbar_a2"; source: "sb_vbar_a2";
action: DRAG_VAL_STEP 0.0 1.0; action: DRAG_VAL_STEP 0.0 1.0;
target: "vbar_bar"; target: "e.dragable.vbar";
} }
program { program {
name: "sb_vbar_a2_up"; name: "sb_vbar_a2_up";
@ -667,28 +667,28 @@ group {
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sb_vbar_p1"; source: "sb_vbar_p1";
action: DRAG_VAL_PAGE 0.0 -1.0; action: DRAG_VAL_PAGE 0.0 -1.0;
target: "vbar_bar"; target: "e.dragable.vbar";
} }
program { program {
name: "sb_vbar_p2_down"; name: "sb_vbar_p2_down";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sb_vbar_p2"; source: "sb_vbar_p2";
action: DRAG_VAL_PAGE 0.0 1.0; action: DRAG_VAL_PAGE 0.0 1.0;
target: "vbar_bar"; target: "e.dragable.vbar";
} }
program { program {
name: "sb_vbar_down"; name: "sb_vbar_down";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "vbar_bar"; source: "e.dragable.vbar";
action: STATE_SET "clicked" 0.0; action: STATE_SET "clicked" 0.0;
target: "vbar_bar"; target: "e.dragable.vbar";
} }
program { program {
name: "sb_vbar_up"; name: "sb_vbar_up";
signal: "mouse,up,1"; signal: "mouse,up,1";
source: "vbar_bar"; source: "e.dragable.vbar";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "vbar_bar"; target: "e.dragable.vbar";
} }
program { program {
name: "sb_hbar_a1_down"; name: "sb_hbar_a1_down";
@ -702,7 +702,7 @@ group {
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sb_hbar_a1"; source: "sb_hbar_a1";
action: DRAG_VAL_STEP -1.0 0.0; action: DRAG_VAL_STEP -1.0 0.0;
target: "hbar_bar"; target: "e.dragable.hbar";
} }
program { program {
name: "sb_hbar_a1_up"; name: "sb_hbar_a1_up";
@ -723,7 +723,7 @@ group {
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sb_hbar_a2"; source: "sb_hbar_a2";
action: DRAG_VAL_STEP 1.0 0.0; action: DRAG_VAL_STEP 1.0 0.0;
target: "hbar_bar"; target: "e.dragable.hbar";
} }
program { program {
name: "sb_hbar_a2_up"; name: "sb_hbar_a2_up";
@ -737,41 +737,41 @@ group {
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sb_hbar_p1"; source: "sb_hbar_p1";
action: DRAG_VAL_PAGE -1.0 0.0; action: DRAG_VAL_PAGE -1.0 0.0;
target: "hbar_bar"; target: "e.dragable.hbar";
} }
program { program {
name: "sb_hbar_p2_down"; name: "sb_hbar_p2_down";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sb_hbar_p2"; source: "sb_hbar_p2";
action: DRAG_VAL_PAGE 1.0 0.0; action: DRAG_VAL_PAGE 1.0 0.0;
target: "hbar_bar"; target: "e.dragable.hbar";
} }
program { program {
name: "sb_hbar_down"; name: "sb_hbar_down";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "hbar_bar"; source: "e.dragable.hbar";
action: STATE_SET "clicked" 0.0; action: STATE_SET "clicked" 0.0;
target: "hbar_bar"; target: "e.dragable.hbar";
} }
program { program {
name: "sb_hbar_up"; name: "sb_hbar_up";
signal: "mouse,up,1"; signal: "mouse,up,1";
source: "hbar_bar"; source: "e.dragable.hbar";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "hbar_bar"; target: "e.dragable.hbar";
} }
program { program {
name: "focus_in"; name: "focus_in";
signal: "focus_in"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.2; transition: DECELERATE 0.2;
target: "focus"; target: "focus";
} }
program { program {
name: "focus_out"; name: "focus_out";
signal: "focus_out"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.5; transition: ACCELERATE 0.5;
target: "focus"; target: "focus";

View File

@ -184,7 +184,7 @@ group {
} }
} }
part { part {
name: "items"; name: "e.swallow.content";
mouse_events: 0; mouse_events: 0;
type: SWALLOW; type: SWALLOW;
description { description {
@ -324,99 +324,99 @@ group {
programs { programs {
program { program {
name: "orient1"; name: "orient1";
signal: "set_orientation"; signal: "e,state,orientation,top";
source: "top"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient2"; name: "orient2";
signal: "set_orientation"; signal: "e,state,orientation,top_left";
source: "top_left"; source: "e";
action: STATE_SET "top_left" 0.0; action: STATE_SET "top_left" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient3"; name: "orient3";
signal: "set_orientation"; signal: "e,state,orientation,top_right";
source: "top_right"; source: "e";
action: STATE_SET "top_right" 0.0; action: STATE_SET "top_right" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient4"; name: "orient4";
signal: "set_orientation"; signal: "e,state,orientation,bottom";
source: "bottom"; source: "e";
action: STATE_SET "bottom" 0.0; action: STATE_SET "bottom" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient5"; name: "orient5";
signal: "set_orientation"; signal: "e,state,orientation,bottom_left";
source: "bottom_left"; source: "e";
action: STATE_SET "bottom_left" 0.0; action: STATE_SET "bottom_left" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient6"; name: "orient6";
signal: "set_orientation"; signal: "e,state,orientation,bottom_right";
source: "bottom_right"; source: "e";
action: STATE_SET "bottom_right" 0.0; action: STATE_SET "bottom_right" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient7"; name: "orient7";
signal: "set_orientation"; signal: "e,state,orientation,left";
source: "left"; source: "e";
action: STATE_SET "left" 0.0; action: STATE_SET "left" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient8"; name: "orient8";
signal: "set_orientation"; signal: "e,state,orientation,left_top";
source: "left_top"; source: "e";
action: STATE_SET "left_top" 0.0; action: STATE_SET "left_top" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient9"; name: "orient9";
signal: "set_orientation"; signal: "e,state,orientation,left_bottom";
source: "left_bottom"; source: "e";
action: STATE_SET "left_bottom" 0.0; action: STATE_SET "left_bottom" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient10"; name: "orient10";
signal: "set_orientation"; signal: "e,state,orientation,right";
source: "right"; source: "e";
action: STATE_SET "right" 0.0; action: STATE_SET "right" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient11"; name: "orient11";
signal: "set_orientation"; signal: "e,state,orientation,right_top";
source: "right_top"; source: "e";
action: STATE_SET "right_top" 0.0; action: STATE_SET "right_top" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient12"; name: "orient12";
signal: "set_orientation"; signal: "e,state,orientation,right_bottom";
source: "right_bottom"; source: "e";
action: STATE_SET "right_bottom" 0.0; action: STATE_SET "right_bottom" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
} }
} }
@ -461,7 +461,7 @@ group {
} }
} }
part { part {
name: "items"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
clip_to: "items_clip"; clip_to: "items_clip";
@ -693,7 +693,7 @@ group {
} }
} }
part { part {
name: "items"; name: "e.swallow.content";
mouse_events: 0; mouse_events: 0;
type: SWALLOW; type: SWALLOW;
description { description {
@ -833,99 +833,99 @@ group {
programs { programs {
program { program {
name: "orient1"; name: "orient1";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "top"; source: "top";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient2"; name: "orient2";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "top_left"; source: "top_left";
action: STATE_SET "top_left" 0.0; action: STATE_SET "top_left" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient3"; name: "orient3";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "top_right"; source: "top_right";
action: STATE_SET "top_right" 0.0; action: STATE_SET "top_right" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient4"; name: "orient4";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "bottom"; source: "bottom";
action: STATE_SET "bottom" 0.0; action: STATE_SET "bottom" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient5"; name: "orient5";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "bottom_left"; source: "bottom_left";
action: STATE_SET "bottom_left" 0.0; action: STATE_SET "bottom_left" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient6"; name: "orient6";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "bottom_right"; source: "bottom_right";
action: STATE_SET "bottom_right" 0.0; action: STATE_SET "bottom_right" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient7"; name: "orient7";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "left"; source: "left";
action: STATE_SET "left" 0.0; action: STATE_SET "left" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient8"; name: "orient8";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "left_top"; source: "left_top";
action: STATE_SET "left_top" 0.0; action: STATE_SET "left_top" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient9"; name: "orient9";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "left_bottom"; source: "left_bottom";
action: STATE_SET "left_bottom" 0.0; action: STATE_SET "left_bottom" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient10"; name: "orient10";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "right"; source: "right";
action: STATE_SET "right" 0.0; action: STATE_SET "right" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient11"; name: "orient11";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "right_top"; source: "right_top";
action: STATE_SET "right_top" 0.0; action: STATE_SET "right_top" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
program { program {
name: "orient12"; name: "orient12";
signal: "set_orientation"; signal: "e,state,orientation,";
source: "right_bottom"; source: "right_bottom";
action: STATE_SET "right_bottom" 0.0; action: STATE_SET "right_bottom" 0.0;
target: "base"; target: "base";
target: "items"; target: "e.swallow.content";
} }
} }
} }
@ -970,7 +970,7 @@ group {
} }
} }
part { part {
name: "items"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
clip_to: "items_clip"; clip_to: "items_clip";
@ -1024,7 +1024,7 @@ group {
} }
parts { parts {
part { part {
name: "items"; name: "e.swallow.content";
mouse_events: 0; mouse_events: 0;
type: SWALLOW; type: SWALLOW;
description { description {
@ -1074,7 +1074,7 @@ group {
} }
} }
part { part {
name: "items"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
clip_to: "items_clip"; clip_to: "items_clip";

View File

@ -94,7 +94,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
mouse_events: 0; mouse_events: 0;
clip_to: "clip"; clip_to: "clip";
@ -120,7 +120,7 @@ group {
size: 10; size: 10;
min: 1 1; min: 1 1;
align: 0.5 0.5; align: 0.5 0.5;
text_class: "slider"; text_class: "e.dragable.slider";
} }
} }
} }
@ -138,12 +138,12 @@ group {
description { description {
state: "active" 0.0; state: "active" 0.0;
rel1 { rel1 {
to: "label"; to: "e.text.label";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -5 -4; offset: -5 -4;
} }
rel2 { rel2 {
to: "label"; to: "e.text.label";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 2 3; offset: 2 3;
} }
@ -166,7 +166,7 @@ group {
rel2 { rel2 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -1 -1; offset: -1 -1;
to: "slider"; to: "e.dragable.slider";
} }
} }
} }
@ -180,12 +180,12 @@ group {
rel1 { rel1 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 0 0; offset: 0 0;
to: "slider"; to: "e.dragable.slider";
} }
} }
} }
part { part {
name: "slider"; name: "e.dragable.slider";
type: RECT; type: RECT;
mouse_events: 1; mouse_events: 1;
dragable { dragable {
@ -218,10 +218,10 @@ group {
min: 32 32; min: 32 32;
fixed: 1 1; fixed: 1 1;
rel1 { rel1 {
to: "slider"; to: "e.dragable.slider";
} }
rel2 { rel2 {
to: "slider"; to: "e.dragable.slider";
} }
image { image {
normal: "e17_slider_bt0.png"; normal: "e17_slider_bt0.png";
@ -317,33 +317,33 @@ group {
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sld_p1"; source: "sld_p1";
action: DRAG_VAL_PAGE 0.0 -1.0; action: DRAG_VAL_PAGE 0.0 -1.0;
target: "slider"; target: "e.dragable.slider";
} }
program { program {
name: "sld_p2_down"; name: "sld_p2_down";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sld_p2"; source: "sld_p2";
action: DRAG_VAL_PAGE 0.0 1.0; action: DRAG_VAL_PAGE 0.0 1.0;
target: "slider"; target: "e.dragable.slider";
} }
program { program {
name: "sld_down"; name: "sld_down";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "slider"; source: "e.dragable.slider";
action: STATE_SET "clicked" 0.0; action: STATE_SET "clicked" 0.0;
target: "slider_img"; target: "slider_img";
} }
program { program {
name: "sld_up"; name: "sld_up";
signal: "mouse,up,1"; signal: "mouse,up,1";
source: "slider"; source: "e.dragable.slider";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "slider_img"; target: "slider_img";
} }
program { program {
name: "sld_in"; name: "sld_in";
signal: "mouse,in"; signal: "mouse,in";
source: "slider"; source: "e.dragable.slider";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "slider_glow"; target: "slider_glow";
@ -359,59 +359,59 @@ group {
program { program {
name: "sld_out"; name: "sld_out";
signal: "mouse,out"; signal: "mouse,out";
source: "slider"; source: "e.dragable.slider";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "slider_glow"; target: "slider_glow";
} }
program { program {
name: "focus_in"; name: "focus_in";
signal: "focus_in"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.2; transition: DECELERATE 0.2;
target: "focus"; target: "focus";
} }
program { program {
name: "focus_out"; name: "focus_out";
signal: "focus_out"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.5; transition: ACCELERATE 0.5;
target: "focus"; target: "focus";
} }
program { program {
name: "show_label"; name: "e,action,show,label";
signal: "show_label"; signal: "e,action,show,label";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "sld_base"; target: "sld_base";
target: "label_under"; target: "label_under";
target: "label"; target: "e.text.label";
target: "label_over"; target: "label_over";
} }
program { program {
name: "hide_label"; name: "e,action,hide,label";
signal: "hide_label"; signal: "e,action,hide,label";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "sld_base"; target: "sld_base";
target: "label_under"; target: "label_under";
target: "label"; target: "e.text.label";
target: "label_over"; target: "label_over";
} }
program { program {
name: "disable"; name: "disable";
signal: "disabled"; signal: "e,state,disabled";
source: ""; source: "e";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;
target: "clip"; target: "clip";
target: "catch"; target: "catch";
} }
program { program {
name: "enable"; name: "enable";
signal: "enabled"; signal: "e,state,enabled";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "clip"; target: "clip";
target: "catch"; target: "catch";
@ -504,7 +504,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
mouse_events: 0; mouse_events: 0;
clip_to: "clip"; clip_to: "clip";
@ -531,7 +531,7 @@ group {
size: 10; size: 10;
min: 1 1; min: 1 1;
align: 0.5 0.5; align: 0.5 0.5;
text_class: "slider"; text_class: "e.dragable.slider";
} }
} }
} }
@ -549,12 +549,12 @@ group {
description { description {
state: "active" 0.0; state: "active" 0.0;
rel1 { rel1 {
to: "label"; to: "e.text.label";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -5 -4; offset: -5 -4;
} }
rel2 { rel2 {
to: "label"; to: "e.text.label";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 2 3; offset: 2 3;
} }
@ -577,7 +577,7 @@ group {
rel2 { rel2 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: -1 -1; offset: -1 -1;
to: "slider"; to: "e.dragable.slider";
} }
} }
} }
@ -591,12 +591,12 @@ group {
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 0 0; offset: 0 0;
to: "slider"; to: "e.dragable.slider";
} }
} }
} }
part { part {
name: "slider"; name: "e.dragable.slider";
type: RECT; type: RECT;
mouse_events: 1; mouse_events: 1;
dragable { dragable {
@ -630,10 +630,10 @@ group {
min: 32 32; min: 32 32;
fixed: 1 1; fixed: 1 1;
rel1 { rel1 {
to: "slider"; to: "e.dragable.slider";
} }
rel2 { rel2 {
to: "slider"; to: "e.dragable.slider";
} }
image { image {
normal: "e17_slider_bt0.png"; normal: "e17_slider_bt0.png";
@ -728,33 +728,33 @@ group {
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sld_p1"; source: "sld_p1";
action: DRAG_VAL_PAGE -1.0 0.0; action: DRAG_VAL_PAGE -1.0 0.0;
target: "slider"; target: "e.dragable.slider";
} }
program { program {
name: "sld_p2_down"; name: "sld_p2_down";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "sld_p2"; source: "sld_p2";
action: DRAG_VAL_PAGE 1.0 0.0; action: DRAG_VAL_PAGE 1.0 0.0;
target: "slider"; target: "e.dragable.slider";
} }
program { program {
name: "sld_down"; name: "sld_down";
signal: "mouse,down,1"; signal: "mouse,down,1";
source: "slider"; source: "e.dragable.slider";
action: STATE_SET "clicked" 0.0; action: STATE_SET "clicked" 0.0;
target: "slider_img"; target: "slider_img";
} }
program { program {
name: "sld_up"; name: "sld_up";
signal: "mouse,up,1"; signal: "mouse,up,1";
source: "slider"; source: "e.dragable.slider";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "slider_img"; target: "slider_img";
} }
program { program {
name: "sld_in"; name: "sld_in";
signal: "mouse,in"; signal: "mouse,in";
source: "slider"; source: "e.dragable.slider";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "slider_glow"; target: "slider_glow";
@ -770,59 +770,59 @@ group {
program { program {
name: "sld_out"; name: "sld_out";
signal: "mouse,out"; signal: "mouse,out";
source: "slider"; source: "e.dragable.slider";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "slider_glow"; target: "slider_glow";
} }
program { program {
name: "focus_in"; name: "focus_in";
signal: "focus_in"; signal: "e,state,focused";
source: ""; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.2; transition: DECELERATE 0.2;
target: "focus"; target: "focus";
} }
program { program {
name: "focus_out"; name: "focus_out";
signal: "focus_out"; signal: "e,state,unfocused";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.5; transition: ACCELERATE 0.5;
target: "focus"; target: "focus";
} }
program { program {
name: "show_label"; name: "e,action,show,label";
signal: "show_label"; signal: "e,action,show,label";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "sld_base"; target: "sld_base";
target: "label_under"; target: "label_under";
target: "label"; target: "e.text.label";
target: "label_over"; target: "label_over";
} }
program { program {
name: "hide_label"; name: "e,action,hide,label";
signal: "hide_label"; signal: "e,action,hide,label";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "sld_base"; target: "sld_base";
target: "label_under"; target: "label_under";
target: "label"; target: "e.text.label";
target: "label_over"; target: "label_over";
} }
program { program {
name: "disable"; name: "disable";
signal: "disabled"; signal: "e,state,disabled";
source: ""; source: "e";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;
target: "clip"; target: "clip";
target: "catch"; target: "catch";
} }
program { program {
name: "enable"; name: "enable";
signal: "enabled"; signal: "e,state,enabled";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "clip"; target: "clip";
target: "catch"; target: "catch";

View File

@ -63,7 +63,7 @@ group {
} }
} }
part { part {
name: "cursor"; name: "e.dragable.cursor";
type: RECT; type: RECT;
dragable { dragable {
confine: "content"; confine: "content";
@ -94,11 +94,11 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to_x: "cursor"; to_x: "e.dragable.cursor";
to_y: "content"; to_y: "content";
} }
rel2 { rel2 {
to_x: "cursor"; to_x: "e.dragable.cursor";
to_y: "content"; to_y: "content";
} }
@ -111,11 +111,11 @@ group {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to_x: "content"; to_x: "content";
to_y: "cursor"; to_y: "e.dragable.cursor";
} }
rel2 { rel2 {
to_x: "content"; to_x: "content";
to_y: "cursor"; to_y: "e.dragable.cursor";
} }
} }

View File

@ -378,8 +378,8 @@ group {
} }
program { program {
name: "handle_active"; name: "handle_active";
signal: "active"; signal: "e,state,focused";
source: ""; source: "e";
script { script {
new val; new val;
@ -392,8 +392,8 @@ group {
} }
program { program {
name: "handle_passive"; name: "handle_passive";
signal: "passive"; signal: "e,state,unfocused";
source: ""; source: "e";
script { script {
new val; new val;

View File

@ -69,7 +69,7 @@ group {
} }
} }
part { part {
name: "reading"; name: "e.text.reading";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
clip_to: "fade_clip"; clip_to: "fade_clip";
@ -162,15 +162,15 @@ group {
programs { programs {
program { program {
name: "known"; name: "known";
signal: "known"; signal: "e,state,known";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "fade_clip"; target: "fade_clip";
} }
program { program {
name: "unknown"; name: "unknown";
signal: "unknown"; signal: "e,state,unknown";
source: ""; source: "e";
action: STATE_SET "faded" 0.0; action: STATE_SET "faded" 0.0;
target: "fade_clip"; target: "fade_clip";
} }

View File

@ -15,7 +15,7 @@ group {
name: "widgets/textblock"; name: "widgets/textblock";
parts { parts {
part { part {
name: "text"; name: "e.textblock.text";
type: TEXTBLOCK; type: TEXTBLOCK;
mouse_events: 0; mouse_events: 0;
description { description {

View File

@ -323,7 +323,7 @@ group {
name: "button_unclick2"; name: "button_unclick2";
signal: "mouse,clicked,1"; signal: "mouse,clicked,1";
source: "button"; source: "button";
action: SIGNAL_EMIT "close" ""; action: SIGNAL_EMIT "e,action,close" "";
} }
program { program {

View File

@ -152,7 +152,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -181,7 +181,7 @@ group {
} }
} }
part { part {
name: "labelblock"; name: "e.textblock.label";
type: TEXTBLOCK; type: TEXTBLOCK;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -383,8 +383,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -458,8 +458,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -625,7 +625,7 @@ group {
} }
} }
part { part {
name: "label"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -654,7 +654,7 @@ group {
} }
} }
part { part {
name: "labelblock"; name: "e.textblock.label";
type: TEXTBLOCK; type: TEXTBLOCK;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -856,8 +856,8 @@ group {
programs { programs {
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";
@ -931,8 +931,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_bar"; target: "title_bar";
target: "title_shadow1"; target: "title_shadow1";

View File

@ -6,7 +6,7 @@ group {
name: "transitions/crossfade"; name: "transitions/crossfade";
parts { parts {
part { part {
name: "bg_prev"; name: "e.swallow.bg.old";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -14,7 +14,7 @@ group {
} }
} }
part { part {
name: "bg_new"; name: "e.swallow.bg.new";
type: SWALLOW; type: SWALLOW;
clip_to: "bg_new_clip"; clip_to: "bg_new_clip";
mouse_events: 0; mouse_events: 0;
@ -40,8 +40,8 @@ group {
programs { programs {
program { program {
name: "go"; name: "go";
signal: "go"; signal: "e,action,start";
source: ""; source: "e";
action: STATE_SET "done" 0.0; action: STATE_SET "done" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "bg_new_clip"; target: "bg_new_clip";
@ -49,7 +49,7 @@ group {
} }
program { program {
name: "go2"; name: "go2";
action: SIGNAL_EMIT "done" ""; action: SIGNAL_EMIT "e,state,done" "";
} }
} }
} }
@ -58,7 +58,7 @@ group {
name: "transitions/vswipe"; name: "transitions/vswipe";
parts { parts {
part { part {
name: "bg_prev"; name: "e.swallow.bg.old";
type: SWALLOW; type: SWALLOW;
clip_to: "bg_prev_clip"; clip_to: "bg_prev_clip";
mouse_events: 0; mouse_events: 0;
@ -67,7 +67,7 @@ group {
} }
} }
part { part {
name: "bg_new"; name: "e.swallow.bg.new";
type: SWALLOW; type: SWALLOW;
clip_to: "bg_new_clip"; clip_to: "bg_new_clip";
mouse_events: 0; mouse_events: 0;
@ -157,8 +157,8 @@ group {
programs { programs {
program { program {
name: "go"; name: "go";
signal: "go"; signal: "e,action,start";
source: ""; source: "e";
action: STATE_SET "done" 0.0; action: STATE_SET "done" 0.0;
transition: SINUSOIDAL 1.0; transition: SINUSOIDAL 1.0;
target: "bg_new_clip"; target: "bg_new_clip";
@ -167,7 +167,7 @@ group {
} }
program { program {
name: "go2"; name: "go2";
action: SIGNAL_EMIT "done" ""; action: SIGNAL_EMIT "e,state,done" "";
} }
} }
} }

View File

@ -78,7 +78,7 @@ group {
} }
} }
part { part {
name: "list_swallow"; name: "e.swallow.list";
type: SWALLOW; type: SWALLOW;
clip_to: "list_clip"; clip_to: "list_clip";
description { description {
@ -87,12 +87,12 @@ group {
rel1 { rel1 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 16 16; offset: 16 16;
to_y: "title"; to_y: "e.text.title";
} }
rel2 { rel2 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -17 -17; offset: -17 -17;
to_y: "icon_swallow"; to_y: "e.swallow.icon";
} }
} }
} }
@ -105,12 +105,12 @@ group {
rel1 { rel1 {
relative: 0.0 0.0; relative: 0.0 0.0;
offset: 0 0; offset: 0 0;
to_y: "list_swallow"; to_y: "e.swallow.list";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -1 -1; offset: -1 -1;
to_y: "list_swallow"; to_y: "e.swallow.list";
} }
} }
} }
@ -126,7 +126,7 @@ group {
rel2 { rel2 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: -2 16; offset: -2 16;
to_y: "list_swallow"; to_y: "e.swallow.list";
} }
image { image {
normal: "e17_winlist_top.png"; normal: "e17_winlist_top.png";
@ -145,7 +145,7 @@ group {
rel1 { rel1 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 1 -3; offset: 1 -3;
to_y: "list_swallow"; to_y: "e.swallow.list";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
@ -161,7 +161,7 @@ group {
} }
} }
part { part {
name: "title"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
mouse_events: 0; mouse_events: 0;
@ -209,7 +209,7 @@ group {
} }
} }
part { part {
name: "title_text"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
mouse_events: 0; mouse_events: 0;
@ -246,12 +246,12 @@ group {
rel1 { rel1 {
relative: 0.0 0.0; relative: 0.0 0.0;
offset: 16 -7; offset: 16 -7;
to_y: "title_text"; to_y: "e.text.label";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -17 6; offset: -17 6;
to_y: "title_text"; to_y: "e.text.label";
} }
image { image {
normal: "e17_ibar_over_h.png"; normal: "e17_ibar_over_h.png";
@ -264,7 +264,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -292,12 +292,12 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to: "icon_swallow"; to: "e.swallow.icon";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -8 -8; offset: -8 -8;
} }
rel2 { rel2 {
to: "icon_swallow"; to: "e.swallow.icon";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 7 7; offset: 7 7;
} }
@ -324,7 +324,7 @@ group {
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 1 -1; offset: 1 -1;
to_x: "icon_swallow"; to_x: "e.swallow.icon";
} }
rel2 { rel2 {
relative: 0.0 1.0; relative: 0.0 1.0;
@ -503,15 +503,15 @@ group {
offset: 0 6; offset: 0 6;
} }
text { text {
text_source: "title_text"; text_source: "e.text.label";
source: "title_text"; source: "e.text.label";
min: 0 1; min: 0 1;
text_class: "title_bar"; text_class: "title_bar";
} }
} }
} }
part { part {
name: "title_text"; name: "e.text.label";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -520,7 +520,7 @@ group {
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 9 6; offset: 9 6;
to_x: "icon_swallow"; to_x: "e.swallow.icon";
} }
rel2 { rel2 {
relative: 0.0 1.0; relative: 0.0 1.0;
@ -706,7 +706,7 @@ group {
} }
} }
part { part {
name: "icon_swallow"; name: "e.swallow.icon";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -772,29 +772,29 @@ group {
programs { programs {
program { program {
name: "type1"; name: "type1";
signal: "iconified"; signal: "e,state,iconified";
source: ""; source: "e";
action: STATE_SET "iconified" 0.0; action: STATE_SET "iconified" 0.0;
target: "type"; target: "type";
} }
program { program {
name: "type2"; name: "type2";
signal: "invisible"; signal: "e,state,invisible";
source: ""; source: "e";
action: STATE_SET "invisible" 0.0; action: STATE_SET "invisible" 0.0;
target: "type"; target: "type";
} }
program { program {
name: "type3"; name: "type3";
signal: "shaded"; signal: "e,state,shaded";
source: ""; source: "e";
action: STATE_SET "shaded" 0.0; action: STATE_SET "shaded" 0.0;
target: "type"; target: "type";
} }
program { program {
name: "go_active_pre"; name: "go_active_pre";
signal: "active"; signal: "e,state,selected";
source: ""; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";
@ -870,8 +870,8 @@ group {
program { program {
name: "go_passive_pre"; name: "go_passive_pre";
signal: "passive"; signal: "e,state,unselected";
source: ""; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
target: "title_outline"; target: "title_outline";
target: "title_bar"; target: "title_bar";

View File

@ -48,10 +48,10 @@ e_about_new(E_Container *con)
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
evas_object_show(o); evas_object_show(o);
edje_object_part_text_set(about->bg_object, "title", _("Enlightenment")); edje_object_part_text_set(about->bg_object, "e.text.title", _("Enlightenment"));
edje_object_part_text_set(about->bg_object, "version", VERSION); edje_object_part_text_set(about->bg_object, "e.text.version", VERSION);
edje_object_part_text_set edje_object_part_text_set
(about->bg_object, "about", (about->bg_object, "e.text.about",
_( _(
"Copyright &copy; 1999-2006, by the Enlightenment Development Team.<br>" "Copyright &copy; 1999-2006, by the Enlightenment Development Team.<br>"
"<br>" "<br>"
@ -68,7 +68,7 @@ e_about_new(E_Container *con)
"yet and may have many bugs. You have been <hilight>WARNED!</hilight>" "yet and may have many bugs. You have been <hilight>WARNED!</hilight>"
) )
); );
edje_object_signal_callback_add(about->bg_object, "close", "", edje_object_signal_callback_add(about->bg_object, "e,action,close", "",
_e_about_cb_close, about); _e_about_cb_close, about);
{ {
FILE *f; FILE *f;
@ -116,7 +116,7 @@ e_about_new(E_Container *con)
fclose(f); fclose(f);
if (tbuf) if (tbuf)
{ {
edje_object_part_text_set(about->bg_object, "authors", tbuf); edje_object_part_text_set(about->bg_object, "e.text.authors", tbuf);
free(tbuf); free(tbuf);
} }
} }

View File

@ -109,7 +109,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
evas_object_data_set(o, "e_zone", zone); evas_object_data_set(o, "e_zone", zone);
snprintf(buf, sizeof(buf), "transitions/%s", trans); snprintf(buf, sizeof(buf), "transitions/%s", trans);
e_theme_edje_object_set(o, "base/theme/transitions", buf); e_theme_edje_object_set(o, "base/theme/transitions", buf);
edje_object_signal_callback_add(o, "done", "*", _e_bg_signal, zone); edje_object_signal_callback_add(o, "e,state,done", "*", _e_bg_signal, zone);
evas_object_move(o, zone->x, zone->y); evas_object_move(o, zone->x, zone->y);
evas_object_resize(o, zone->w, zone->h); evas_object_resize(o, zone->w, zone->h);
evas_object_layer_set(o, -1); evas_object_layer_set(o, -1);
@ -128,11 +128,11 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
if (transition != E_BG_TRANSITION_NONE) if (transition != E_BG_TRANSITION_NONE)
{ {
edje_object_part_swallow(zone->transition_object, "bg_prev", edje_object_part_swallow(zone->transition_object, "e.swallow.bg.old",
zone->prev_bg_object); zone->prev_bg_object);
edje_object_part_swallow(zone->transition_object, "bg_new", edje_object_part_swallow(zone->transition_object, "e.swallow.bg.new",
zone->bg_object); zone->bg_object);
edje_object_signal_emit(zone->transition_object, "go", ""); edje_object_signal_emit(zone->transition_object, "e,action,start", "e");
} }
} }

View File

@ -1297,17 +1297,17 @@ e_border_focus_set(E_Border *bd, int focus, int set)
e_border_focus_latest_set(bd); e_border_focus_latest_set(bd);
} }
// printf("EMIT 0x%x activeve\n", bd->client.win); // printf("EMIT 0x%x activeve\n", bd->client.win);
edje_object_signal_emit(bd->bg_object, "active", ""); edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
if (bd->icon_object) if (bd->icon_object)
edje_object_signal_emit(bd->icon_object, "active", ""); edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
e_focus_event_focus_in(bd); e_focus_event_focus_in(bd);
} }
else if ((!focus) && (bd->focused)) else if ((!focus) && (bd->focused))
{ {
// printf("EMIT 0x%x passive\n", bd->client.win); // printf("EMIT 0x%x passive\n", bd->client.win);
edje_object_signal_emit(bd->bg_object, "passive", ""); edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e");
if (bd->icon_object) if (bd->icon_object)
edje_object_signal_emit(bd->icon_object, "passive", ""); edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e");
e_focus_event_focus_out(bd); e_focus_event_focus_out(bd);
/* FIXME: Sometimes we should leave the window fullscreen! */ /* FIXME: Sometimes we should leave the window fullscreen! */
// if (bd->fullscreen) // if (bd->fullscreen)
@ -1358,9 +1358,9 @@ e_border_focus_set(E_Border *bd, int focus, int set)
E_Event_Border_Focus_Out *ev; E_Event_Border_Focus_Out *ev;
// printf("unfocus previous\n"); // printf("unfocus previous\n");
edje_object_signal_emit(focused->bg_object, "passive", ""); edje_object_signal_emit(focused->bg_object, "e,state,unfocused", "e");
if (focused->icon_object) if (focused->icon_object)
edje_object_signal_emit(focused->icon_object, "passive", ""); edje_object_signal_emit(focused->icon_object, "e,state,unfocused", "e");
e_focus_event_focus_out(focused); e_focus_event_focus_out(focused);
ev = calloc(1, sizeof(E_Event_Border_Focus_Out)); ev = calloc(1, sizeof(E_Event_Border_Focus_Out));
@ -1392,9 +1392,9 @@ e_border_focus_set(E_Border *bd, int focus, int set)
if (focused) if (focused)
{ {
// printf("unfocus previous 2\n"); // printf("unfocus previous 2\n");
edje_object_signal_emit(focused->bg_object, "passive", ""); edje_object_signal_emit(focused->bg_object, "e,state,unfocused", "e");
if (focused->icon_object) if (focused->icon_object)
edje_object_signal_emit(focused->icon_object, "passive", ""); edje_object_signal_emit(focused->icon_object, "e,state,unfocused", "e");
e_focus_event_focus_out(focused); e_focus_event_focus_out(focused);
/* FIXME: Sometimes we should leave the window fullscreen! */ /* FIXME: Sometimes we should leave the window fullscreen! */
if (focused->fullscreen) e_border_unfullscreen(focused); if (focused->fullscreen) e_border_unfullscreen(focused);
@ -1485,7 +1485,7 @@ e_border_shade(E_Border *bd, E_Direction dir)
ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE); ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE);
bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd); bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
edje_object_signal_emit(bd->bg_object, "shading", ""); edje_object_signal_emit(bd->bg_object, "e,state,shading", "e");
} }
else else
{ {
@ -1524,7 +1524,7 @@ e_border_shade(E_Border *bd, E_Direction dir)
bd->need_shape_merge = 1; bd->need_shape_merge = 1;
bd->need_shape_export = 1; bd->need_shape_export = 1;
} }
edje_object_signal_emit(bd->bg_object, "shaded", ""); edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
ev = calloc(1, sizeof(E_Event_Border_Resize)); ev = calloc(1, sizeof(E_Event_Border_Resize));
ev->border = bd; ev->border = bd;
/* The resize is added in the animator when animation complete */ /* The resize is added in the animator when animation complete */
@ -1595,7 +1595,7 @@ e_border_unshade(E_Border *bd, E_Direction dir)
ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE); ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE);
bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd); bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
edje_object_signal_emit(bd->bg_object, "unshading", ""); edje_object_signal_emit(bd->bg_object, "e,state,unshading", "e");
} }
else else
{ {
@ -1633,7 +1633,7 @@ e_border_unshade(E_Border *bd, E_Direction dir)
bd->need_shape_merge = 1; bd->need_shape_merge = 1;
bd->need_shape_export = 1; bd->need_shape_export = 1;
} }
edje_object_signal_emit(bd->bg_object, "unshaded", ""); edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
ev = calloc(1, sizeof(E_Event_Border_Resize)); ev = calloc(1, sizeof(E_Event_Border_Resize));
ev->border = bd; ev->border = bd;
/* The resize is added in the animator when animation complete */ /* The resize is added in the animator when animation complete */
@ -1701,12 +1701,12 @@ e_border_maximize(E_Border *bd, E_Maximize max)
{ {
Evas_Coord cx, cy, cw, ch; Evas_Coord cx, cy, cw, ch;
edje_object_signal_emit(bd->bg_object, "maximize,fullscreen", ""); edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
edje_object_message_signal_process(bd->bg_object); edje_object_message_signal_process(bd->bg_object);
evas_object_resize(bd->bg_object, 1000, 1000); evas_object_resize(bd->bg_object, 1000, 1000);
edje_object_calc_force(bd->bg_object); edje_object_calc_force(bd->bg_object);
edje_object_part_geometry_get(bd->bg_object, "client", &cx, &cy, &cw, &ch); edje_object_part_geometry_get(bd->bg_object, "e.client", &cx, &cy, &cw, &ch);
bd->client_inset.l = cx; bd->client_inset.l = cx;
bd->client_inset.r = 1000 - (cx + cw); bd->client_inset.r = 1000 - (cx + cw);
bd->client_inset.t = cy; bd->client_inset.t = cy;
@ -1757,7 +1757,7 @@ e_border_maximize(E_Border *bd, E_Maximize max)
e_border_move_resize(bd, bd->x, y1, bd->w, h); e_border_move_resize(bd, bd->x, y1, bd->w, h);
else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
e_border_move_resize(bd, x1, bd->y, w, bd->h); e_border_move_resize(bd, x1, bd->y, w, bd->h);
edje_object_signal_emit(bd->bg_object, "maximize", ""); edje_object_signal_emit(bd->bg_object, "e,action,maximize", "e");
break; break;
case E_MAXIMIZE_FILL: case E_MAXIMIZE_FILL:
x1 = bd->zone->x; x1 = bd->zone->x;
@ -1835,13 +1835,13 @@ e_border_unmaximize(E_Border *bd, E_Maximize max)
{ {
Evas_Coord cx, cy, cw, ch; Evas_Coord cx, cy, cw, ch;
edje_object_signal_emit(bd->bg_object, "unmaximize,fullscreen", ""); edje_object_signal_emit(bd->bg_object, "e,action,unmaximize,fullscreen", "e");
signal = 0; signal = 0;
edje_object_message_signal_process(bd->bg_object); edje_object_message_signal_process(bd->bg_object);
evas_object_resize(bd->bg_object, 1000, 1000); evas_object_resize(bd->bg_object, 1000, 1000);
edje_object_calc_force(bd->bg_object); edje_object_calc_force(bd->bg_object);
edje_object_part_geometry_get(bd->bg_object, "client", &cx, &cy, &cw, &ch); edje_object_part_geometry_get(bd->bg_object, "e.client", &cx, &cy, &cw, &ch);
bd->client_inset.l = cx; bd->client_inset.l = cx;
bd->client_inset.r = 1000 - (cx + cw); bd->client_inset.r = 1000 - (cx + cw);
bd->client_inset.t = cy; bd->client_inset.t = cy;
@ -1911,7 +1911,7 @@ e_border_unmaximize(E_Border *bd, E_Maximize max)
bd->maximized & E_MAXIMIZE_VERTICAL); bd->maximized & E_MAXIMIZE_VERTICAL);
if (signal) if (signal)
edje_object_signal_emit(bd->bg_object, "unmaximize", ""); edje_object_signal_emit(bd->bg_object, "e,action,unmaximize", "e");
} }
if (bd->remember) if (bd->remember)
e_remember_update(bd->remember, bd); e_remember_update(bd->remember, bd);
@ -2054,7 +2054,7 @@ e_border_iconify(E_Border *bd)
{ {
bd->iconic = 1; bd->iconic = 1;
e_border_hide(bd, 1); e_border_hide(bd, 1);
edje_object_signal_emit(bd->bg_object, "iconify", ""); edje_object_signal_emit(bd->bg_object, "e,action,iconify", "e");
} }
iconic = 1; iconic = 1;
e_hints_window_iconic_set(bd); e_hints_window_iconic_set(bd);
@ -2099,7 +2099,7 @@ e_border_uniconify(E_Border *bd)
e_border_desk_set(bd, desk); e_border_desk_set(bd, desk);
e_border_show(bd); e_border_show(bd);
e_border_raise(bd); e_border_raise(bd);
edje_object_signal_emit(bd->bg_object, "uniconify", ""); edje_object_signal_emit(bd->bg_object, "e,action,uniconify", "e");
} }
iconic = 0; iconic = 0;
ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MAPPED, &iconic, 1); ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MAPPED, &iconic, 1);
@ -2725,7 +2725,7 @@ e_border_frame_recalc(E_Border *bd)
evas_object_resize(bd->bg_object, 1000, 1000); evas_object_resize(bd->bg_object, 1000, 1000);
edje_object_calc_force(bd->bg_object); edje_object_calc_force(bd->bg_object);
edje_object_part_geometry_get(bd->bg_object, "client", &cx, &cy, &cw, &ch); edje_object_part_geometry_get(bd->bg_object, "e.client", &cx, &cy, &cw, &ch);
bd->client_inset.l = cx; bd->client_inset.l = cx;
bd->client_inset.r = 1000 - (cx + cw); bd->client_inset.r = 1000 - (cx + cw);
bd->client_inset.t = cy; bd->client_inset.t = cy;
@ -4205,7 +4205,7 @@ _e_border_cb_signal_bind(void *data, Evas_Object *obj, const char *emission, con
bd = data; bd = data;
if (e_dnd_active()) return; if (e_dnd_active()) return;
e_bindings_signal_handle(E_BINDING_CONTEXT_BORDER, E_OBJECT(bd), e_bindings_signal_handle(E_BINDING_CONTEXT_BORDER, E_OBJECT(bd),
emission, source); (char *)emission, (char *)source);
} }
static int static int
@ -4741,7 +4741,7 @@ _e_border_eval(E_Border *bd)
bd->client.icccm.fetch.title = 0; bd->client.icccm.fetch.title = 0;
if (bd->bg_object) if (bd->bg_object)
{ {
edje_object_part_text_set(bd->bg_object, "title_text", edje_object_part_text_set(bd->bg_object, "e.text.title",
bd->client.icccm.title); bd->client.icccm.title);
} }
rem_change = 1; rem_change = 1;
@ -4754,7 +4754,7 @@ _e_border_eval(E_Border *bd)
bd->client.netwm.fetch.name = 0; bd->client.netwm.fetch.name = 0;
if (bd->bg_object) if (bd->bg_object)
{ {
edje_object_part_text_set(bd->bg_object, "title_text", edje_object_part_text_set(bd->bg_object, "e.text.title",
bd->client.netwm.name); bd->client.netwm.name);
} }
rem_change = 1; rem_change = 1;
@ -5434,14 +5434,14 @@ _e_border_eval(E_Border *bd)
} }
if (bd->client.netwm.name) if (bd->client.netwm.name)
edje_object_part_text_set(o, "title_text", edje_object_part_text_set(o, "e.text.title",
bd->client.netwm.name); bd->client.netwm.name);
else if (bd->client.icccm.title) else if (bd->client.icccm.title)
edje_object_part_text_set(o, "title_text", edje_object_part_text_set(o, "e.text.title",
bd->client.icccm.title); bd->client.icccm.title);
evas_object_resize(o, 1000, 1000); evas_object_resize(o, 1000, 1000);
edje_object_calc_force(o); edje_object_calc_force(o);
edje_object_part_geometry_get(o, "client", &cx, &cy, &cw, &ch); edje_object_part_geometry_get(o, "e.client", &cx, &cy, &cw, &ch);
l = cx; l = cx;
r = 1000 - (cx + cw); r = 1000 - (cx + cw);
t = cy; t = cy;
@ -5472,20 +5472,20 @@ _e_border_eval(E_Border *bd)
_e_border_cb_signal_bind, bd); _e_border_cb_signal_bind, bd);
if (bd->focused) if (bd->focused)
{ {
edje_object_signal_emit(bd->bg_object, "active", ""); edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
if (bd->icon_object) if (bd->icon_object)
edje_object_signal_emit(bd->icon_object, "active", ""); edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
} }
if (bd->shaded) if (bd->shaded)
edje_object_signal_emit(bd->bg_object, "shaded", ""); edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
if ((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) if ((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN)
edje_object_signal_emit(bd->bg_object, "maximize,fullscreen", ""); edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
else if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE) else if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
edje_object_signal_emit(bd->bg_object, "maximize", ""); edje_object_signal_emit(bd->bg_object, "e,action,maximize", "e");
if (bd->hung) if (bd->hung)
edje_object_signal_emit(bd->bg_object, "hung", ""); edje_object_signal_emit(bd->bg_object, "e,state,hung", "e");
if (bd->client.icccm.urgent) if (bd->client.icccm.urgent)
edje_object_signal_emit(bd->bg_object, "urgent", ""); edje_object_signal_emit(bd->bg_object, "e,state,urgent", "e");
evas_object_move(bd->bg_object, 0, 0); evas_object_move(bd->bg_object, 0, 0);
evas_object_resize(bd->bg_object, bd->w, bd->h); evas_object_resize(bd->bg_object, bd->w, bd->h);
@ -5499,7 +5499,7 @@ _e_border_eval(E_Border *bd)
if (bd->bg_object) if (bd->bg_object)
{ {
evas_object_show(bd->icon_object); evas_object_show(bd->icon_object);
edje_object_part_swallow(bd->bg_object, "icon_swallow", bd->icon_object); edje_object_part_swallow(bd->bg_object, "e.swallow.icon", bd->icon_object);
} }
else else
{ {
@ -6156,11 +6156,11 @@ _e_border_eval(E_Border *bd)
} }
bd->icon_object = e_border_icon_add(bd, bd->bg_evas); bd->icon_object = e_border_icon_add(bd, bd->bg_evas);
if ((bd->focused) && (bd->icon_object)) if ((bd->focused) && (bd->icon_object))
edje_object_signal_emit(bd->icon_object, "active", ""); edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
if (bd->bg_object) if (bd->bg_object)
{ {
evas_object_show(bd->icon_object); evas_object_show(bd->icon_object);
edje_object_part_swallow(bd->bg_object, "icon_swallow", bd->icon_object); edje_object_part_swallow(bd->bg_object, "e.swallow.icon", bd->icon_object);
} }
else else
{ {
@ -6183,9 +6183,9 @@ _e_border_eval(E_Border *bd)
if (change_urgent) if (change_urgent)
{ {
if (bd->client.icccm.urgent) if (bd->client.icccm.urgent)
edje_object_signal_emit(bd->bg_object, "urgent", ""); edje_object_signal_emit(bd->bg_object, "e,state,urgent", "e");
else else
edje_object_signal_emit(bd->bg_object, "not_urgent", ""); edje_object_signal_emit(bd->bg_object, "e,state,not_urgent", "e");
/* FIXME: we should probably do something with the pager or /* FIXME: we should probably do something with the pager or
* maybe raising the window if it becomes urgent * maybe raising the window if it becomes urgent
*/ */
@ -6457,11 +6457,11 @@ _e_border_shade_animator(void *data)
if (bd->shaded) if (bd->shaded)
{ {
edje_object_signal_emit(bd->bg_object, "shaded", ""); edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
} }
else else
{ {
edje_object_signal_emit(bd->bg_object, "unshaded", ""); edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
} }
ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NW); ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NW);
ev = calloc(1, sizeof(E_Event_Border_Resize)); ev = calloc(1, sizeof(E_Event_Border_Resize));
@ -6876,7 +6876,7 @@ _e_border_cb_ping_timer(void *data)
if (bd->hung) if (bd->hung)
{ {
bd->hung = 0; bd->hung = 0;
edje_object_signal_emit(bd->bg_object, "unhung", ""); edje_object_signal_emit(bd->bg_object, "e,state,unhung", "e");
if (bd->kill_timer) if (bd->kill_timer)
{ {
ecore_timer_del(bd->kill_timer); ecore_timer_del(bd->kill_timer);
@ -6889,7 +6889,7 @@ _e_border_cb_ping_timer(void *data)
if (!bd->hung) if (!bd->hung)
{ {
bd->hung = 1; bd->hung = 1;
edje_object_signal_emit(bd->bg_object, "hung", ""); edje_object_signal_emit(bd->bg_object, "e,state,hung", "e");
/* FIXME: if below dialog is up - hide it now */ /* FIXME: if below dialog is up - hide it now */
} }
if (bd->delete_requested) if (bd->delete_requested)

View File

@ -471,8 +471,6 @@ e_config_init(void)
E_CONFIG_VAL(D, T, border_raise_on_focus, INT); E_CONFIG_VAL(D, T, border_raise_on_focus, INT);
E_CONFIG_VAL(D, T, desk_flip_wrap, INT); E_CONFIG_VAL(D, T, desk_flip_wrap, INT);
E_CONFIG_VAL(D, T, icon_theme, STR);
E_CONFIG_VAL(D, T, wallpaper_import_last_dev, STR); E_CONFIG_VAL(D, T, wallpaper_import_last_dev, STR);
E_CONFIG_VAL(D, T, wallpaper_import_last_path, STR); E_CONFIG_VAL(D, T, wallpaper_import_last_path, STR);
@ -657,8 +655,6 @@ e_config_init(void)
e_config->display_res_height = 0; e_config->display_res_height = 0;
e_config->display_res_hz = 0; e_config->display_res_hz = 0;
e_config->display_res_rotation = 0; e_config->display_res_rotation = 0;
e_config->icon_theme = evas_stringshare_add("hicolor");
{ {
E_Config_Module *em; E_Config_Module *em;
@ -916,85 +912,112 @@ e_config_init(void)
eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \ eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \
e_config->signal_bindings = evas_list_append(e_config->signal_bindings, eb) e_config->signal_bindings = evas_list_append(e_config->signal_bindings, eb)
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1,double", "title", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1,double",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_shaded_toggle", "up"); "window_shaded_toggle", "up");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,2", "title", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,2",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_shaded_toggle", "up"); "window_shaded_toggle", "up");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,wheel,?,1", "title", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,wheel,?,1",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_shaded", "0 up"); "window_shaded", "0 up");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,wheel,?,-1", "title", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,wheel,?,-1",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_shaded", "1 up"); "window_shaded", "1 up");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,3", "title", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,3",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_menu", NULL); "window_menu", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,?", "icon", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,?",
"e.event.icon",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_menu", NULL); "window_menu", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,[12]", "close", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,[12]",
"e.event.close",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_close", NULL); "window_close", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,3", "close", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,3",
"e.event.close",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_kill", NULL); "window_kill", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,1", "maximize", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,1",
"e.event.maximize",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_maximized_toggle", NULL); "window_maximized_toggle", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,2", "maximize", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,2",
"e.event.maximize",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_maximized_toggle", "smart"); "window_maximized_toggle", "smart");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,3", "maximize", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,3",
"e.event.maximize",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_maximized_toggle", "expand"); "window_maximized_toggle", "expand");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,?", "minimize", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,?",
"e.event.minimize",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_iconic_toggle", NULL); "window_iconic_toggle", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,?", "shade", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,?",
"e.event.shade",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_shaded_toggle", "up"); "window_shaded_toggle", "up");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1", "icon", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.icon",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_drag_icon", NULL); "window_drag_icon", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1", "title", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_move", NULL); "window_move", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,up,1", "title", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,up,1",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_move", "end"); "window_move", "end");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1", "resize_tl", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.tl",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_resize", "tl"); "window_resize", "tl");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1", "resize_t", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.t",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_resize", "t"); "window_resize", "t");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1", "resize_tr", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.tr",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_resize", "tr"); "window_resize", "tr");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1", "resize_r", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.r",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_resize", "r"); "window_resize", "r");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1", "resize_br", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.br",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_resize", "br"); "window_resize", "br");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1", "resize_b", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.b",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_resize", "b"); "window_resize", "b");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1", "resize_bl", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.bl",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_resize", "bl"); "window_resize", "bl");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1", "resize_l", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.l",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_resize", "l"); "window_resize", "l");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,up,1", "resize_*", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,up,1",
"e.event.resize.*",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_resize", "end"); "window_resize", "end");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,3", "resize_*", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,3",
"e.event.resize.*",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_move", NULL); "window_move", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,up,3", "resize_*", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,up,3",
"e.event.resize.*",
E_BINDING_MODIFIER_NONE, 1, E_BINDING_MODIFIER_NONE, 1,
"window_move", "end"); "window_move", "end");
} }
@ -1188,6 +1211,123 @@ e_config_init(void)
e_config->wallpaper_grad_c2_g = 255; e_config->wallpaper_grad_c2_g = 255;
e_config->wallpaper_grad_c2_b = 255; e_config->wallpaper_grad_c2_b = 255;
IFCFGEND; IFCFGEND;
IFCFG(0x0100);
/* these changed, so update them */
{
E_Config_Binding_Signal *eb;
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1,double",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1,
"window_shaded_toggle", "up");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,2",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1,
"window_shaded_toggle", "up");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,wheel,?,1",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1,
"window_shaded", "0 up");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,wheel,?,-1",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1,
"window_shaded", "1 up");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,3",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1,
"window_menu", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,?",
"e.event.icon",
E_BINDING_MODIFIER_NONE, 1,
"window_menu", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,[12]",
"e.event.close",
E_BINDING_MODIFIER_NONE, 1,
"window_close", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,3",
"e.event.close",
E_BINDING_MODIFIER_NONE, 1,
"window_kill", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,1",
"e.event.maximize",
E_BINDING_MODIFIER_NONE, 1,
"window_maximized_toggle", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,2",
"e.event.maximize",
E_BINDING_MODIFIER_NONE, 1,
"window_maximized_toggle", "smart");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,3",
"e.event.maximize",
E_BINDING_MODIFIER_NONE, 1,
"window_maximized_toggle", "expand");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,?",
"e.event.minimize",
E_BINDING_MODIFIER_NONE, 1,
"window_iconic_toggle", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,clicked,?",
"e.event.shade",
E_BINDING_MODIFIER_NONE, 1,
"window_shaded_toggle", "up");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.icon",
E_BINDING_MODIFIER_NONE, 1,
"window_drag_icon", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1,
"window_move", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,up,1",
"e.event.titlebar",
E_BINDING_MODIFIER_NONE, 1,
"window_move", "end");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.tl",
E_BINDING_MODIFIER_NONE, 1,
"window_resize", "tl");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.t",
E_BINDING_MODIFIER_NONE, 1,
"window_resize", "t");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.tr",
E_BINDING_MODIFIER_NONE, 1,
"window_resize", "tr");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.r",
E_BINDING_MODIFIER_NONE, 1,
"window_resize", "r");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.br",
E_BINDING_MODIFIER_NONE, 1,
"window_resize", "br");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.b",
E_BINDING_MODIFIER_NONE, 1,
"window_resize", "b");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.bl",
E_BINDING_MODIFIER_NONE, 1,
"window_resize", "bl");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1",
"e.event.resize.l",
E_BINDING_MODIFIER_NONE, 1,
"window_resize", "l");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,up,1",
"e.event.resize.*",
E_BINDING_MODIFIER_NONE, 1,
"window_resize", "end");
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,3",
"e.event.resize.*",
E_BINDING_MODIFIER_NONE, 1,
"window_move", NULL);
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,up,3",
"e.event.resize.*",
E_BINDING_MODIFIER_NONE, 1,
"window_move", "end");
}
IFCFGEND;
#if 0 /* example of new config */ #if 0 /* example of new config */
IFCFG(0x0090); /* the version # where this value(s) was introduced */ IFCFG(0x0090); /* the version # where this value(s) was introduced */
@ -1877,7 +2017,6 @@ _e_config_free(void)
if (e_config->transition_desk) evas_stringshare_del(e_config->transition_desk); if (e_config->transition_desk) evas_stringshare_del(e_config->transition_desk);
if (e_config->transition_change) evas_stringshare_del(e_config->transition_change); if (e_config->transition_change) evas_stringshare_del(e_config->transition_change);
if (e_config->input_method) evas_stringshare_del(e_config->input_method); if (e_config->input_method) evas_stringshare_del(e_config->input_method);
if (e_config->icon_theme) evas_stringshare_del(e_config->icon_theme);
E_FREE(e_config); E_FREE(e_config);
} }
} }

View File

@ -50,7 +50,7 @@ typedef Eet_Data_Descriptor E_Config_DD;
/* increment this whenever a new set of config values are added but the users /* increment this whenever a new set of config values are added but the users
* config doesn't need top be wiped - simply new values need to be put in * config doesn't need top be wiped - simply new values need to be put in
*/ */
#define E_CONFIG_FILE_GENERATION 0x0099 #define E_CONFIG_FILE_GENERATION 0x0100
#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION) #define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
#define E_EVAS_ENGINE_DEFAULT 0 #define E_EVAS_ENGINE_DEFAULT 0

View File

@ -59,7 +59,7 @@ e_configure_show(E_Container *con)
e_widget_ilist_selector_set(eco->ilist, 1); e_widget_ilist_selector_set(eco->ilist, 1);
e_widget_min_size_get(eco->ilist, &mw, &mh); e_widget_min_size_get(eco->ilist, &mw, &mh);
edje_extern_object_min_size_set(eco->ilist, mw, mh); edje_extern_object_min_size_set(eco->ilist, mw, mh);
edje_object_part_swallow(eco->edje, "item", eco->ilist); edje_object_part_swallow(eco->edje, "e.swallow.content", eco->ilist);
edje_object_part_text_set(eco->edje, "title", _("Configuration Panel")); edje_object_part_text_set(eco->edje, "title", _("Configuration Panel"));
/* add items here */ /* add items here */
@ -105,7 +105,7 @@ e_configure_show(E_Container *con)
eco->close = e_widget_button_add(eco->evas, _("Close"), NULL, _e_configure_cb_close, eco, NULL); eco->close = e_widget_button_add(eco->evas, _("Close"), NULL, _e_configure_cb_close, eco, NULL);
e_widget_min_size_get(eco->close, &mw, &mh); e_widget_min_size_get(eco->close, &mw, &mh);
edje_extern_object_min_size_set(eco->close, mw, mh); edje_extern_object_min_size_set(eco->close, mw, mh);
edje_object_part_swallow(eco->edje, "button", eco->close); edje_object_part_swallow(eco->edje, "e.swallow.button", eco->close);
edje_object_size_min_calc(eco->edje, &ew, &eh); edje_object_size_min_calc(eco->edje, &ew, &eh);
e_win_resize(eco->win, ew, eh); e_win_resize(eco->win, ew, eh);

View File

@ -255,9 +255,9 @@ e_desklock_show(void)
e_theme_edje_object_set(edp->login_box, e_theme_edje_object_set(edp->login_box,
"base/theme/desklock", "base/theme/desklock",
"desklock/login_box"); "desklock/login_box");
edje_object_part_text_set(edp->login_box, "title", edje_object_part_text_set(edp->login_box, "e.text.title",
_("Please enter your unlock password")); _("Please enter your unlock password"));
edje_object_part_swallow(edp->bg_object, "login_box", edp->login_box); edje_object_part_swallow(edp->bg_object, "e.swallow.login_box", edp->login_box);
edje_object_size_min_calc(edp->login_box, &mw, &mh); edje_object_size_min_calc(edp->login_box, &mw, &mh);
evas_object_move(edp->login_box, (int)((zone->w - mw)/2), evas_object_move(edp->login_box, (int)((zone->w - mw)/2),
(int)((zone->h - mh)/2)); (int)((zone->h - mh)/2));
@ -445,7 +445,7 @@ _e_desklock_passwd_update()
for (l = edd->elock_wnd_list; l; l = l->next) for (l = edd->elock_wnd_list; l; l = l->next)
{ {
edp = l->data; edp = l->data;
edje_object_part_text_set(edp->login_box, "passwd", passwd_hidden); edje_object_part_text_set(edp->login_box, "e.text.password", passwd_hidden);
} }
} }

View File

@ -54,7 +54,7 @@ e_dialog_new(E_Container *con, const char *name, const char *class)
o = e_widget_list_add(e_win_evas_get(dia->win), 1, 1); o = e_widget_list_add(e_win_evas_get(dia->win), 1, 1);
e_widget_on_focus_hook_set(o, _e_dialog_cb_wid_on_focus, dia); e_widget_on_focus_hook_set(o, _e_dialog_cb_wid_on_focus, dia);
dia->box_object = o; dia->box_object = o;
edje_object_part_swallow(dia->bg_object, "buttons_swallow", o); edje_object_part_swallow(dia->bg_object, "e.swallow.buttons", o);
o = evas_object_rectangle_add(e_win_evas_get(dia->win)); o = evas_object_rectangle_add(e_win_evas_get(dia->win));
dia->event_object = o; dia->event_object = o;
@ -133,10 +133,10 @@ e_dialog_text_set(E_Dialog *dia, const char *text)
dia->text_object = o; dia->text_object = o;
e_theme_edje_object_set(o, "base/theme/dialog", e_theme_edje_object_set(o, "base/theme/dialog",
"widgets/dialog/text"); "widgets/dialog/text");
edje_object_part_swallow(dia->bg_object, "content_swallow", o); edje_object_part_swallow(dia->bg_object, "e.swallow.content", o);
evas_object_show(o); evas_object_show(o);
} }
edje_object_part_text_set(dia->text_object, "text", text); edje_object_part_text_set(dia->text_object, "e.textblock.message", text);
} }
EAPI void EAPI void
@ -147,7 +147,7 @@ e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size)
dia->icon_object = edje_object_add(e_win_evas_get(dia->win)); dia->icon_object = edje_object_add(e_win_evas_get(dia->win));
e_util_edje_icon_set(dia->icon_object, icon); e_util_edje_icon_set(dia->icon_object, icon);
edje_extern_object_min_size_set(dia->icon_object, size, size); edje_extern_object_min_size_set(dia->icon_object, size, size);
edje_object_part_swallow(dia->bg_object, "icon_swallow", dia->icon_object); edje_object_part_swallow(dia->bg_object, "e.swallow.icon", dia->icon_object);
evas_object_show(dia->icon_object); evas_object_show(dia->icon_object);
} }
@ -169,7 +169,7 @@ e_dialog_content_set(E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coor
dia->content_object = obj; dia->content_object = obj;
e_widget_on_focus_hook_set(obj, _e_dialog_cb_wid_on_focus, dia); e_widget_on_focus_hook_set(obj, _e_dialog_cb_wid_on_focus, dia);
edje_extern_object_min_size_set(obj, minw, minh); edje_extern_object_min_size_set(obj, minw, minh);
edje_object_part_swallow(dia->bg_object, "content_swallow", obj); edje_object_part_swallow(dia->bg_object, "e.swallow.content", obj);
evas_object_show(obj); evas_object_show(obj);
} }
@ -202,13 +202,13 @@ e_dialog_show(E_Dialog *dia)
{ {
edje_object_size_min_calc(o, &mw, &mh); edje_object_size_min_calc(o, &mw, &mh);
edje_extern_object_min_size_set(o, mw, mh); edje_extern_object_min_size_set(o, mw, mh);
edje_object_part_swallow(dia->bg_object, "content_swallow", o); edje_object_part_swallow(dia->bg_object, "e.swallow.content", o);
} }
o = dia->box_object; o = dia->box_object;
e_widget_min_size_get(o, &mw, &mh); e_widget_min_size_get(o, &mw, &mh);
edje_extern_object_min_size_set(o, mw, mh); edje_extern_object_min_size_set(o, mw, mh);
edje_object_part_swallow(dia->bg_object, "buttons_swallow", o); edje_object_part_swallow(dia->bg_object, "e.swallow.buttons", o);
edje_object_size_min_calc(dia->bg_object, &mw, &mh); edje_object_size_min_calc(dia->bg_object, &mw, &mh);
evas_object_resize(dia->bg_object, mw, mh); evas_object_resize(dia->bg_object, mw, mh);

View File

@ -488,7 +488,7 @@ e_editable_cursor_show(Evas_Object *editable)
if (evas_object_visible_get(editable)) if (evas_object_visible_get(editable))
{ {
evas_object_show(sd->cursor_object); evas_object_show(sd->cursor_object);
edje_object_signal_emit(sd->cursor_object, "cursor_show", ""); edje_object_signal_emit(sd->cursor_object, "e,action,show,cursor", "e");
} }
} }
@ -704,7 +704,7 @@ e_editable_pos_get_from_coords(Evas_Object *editable, Evas_Coord x, Evas_Coord y
if ((!editable) || (!(sd = evas_object_smart_data_get(editable)))) if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
return -1; return -1;
if (!(text_obj = edje_object_part_object_get(sd->text_object, "text"))) if (!(text_obj = edje_object_part_object_get(sd->text_object, "e.text.text")))
return -1; return -1;
evas_object_geometry_get(editable, &ox, &oy, NULL, NULL); evas_object_geometry_get(editable, &ox, &oy, NULL, NULL);
@ -763,7 +763,7 @@ e_editable_char_size_get(Evas_Object *editable, int *w, int *h)
return; return;
if (!(sd = evas_object_smart_data_get(editable))) if (!(sd = evas_object_smart_data_get(editable)))
return; return;
if (!(text_obj = edje_object_part_object_get(sd->text_object, "text"))) if (!(text_obj = edje_object_part_object_get(sd->text_object, "e.text.text")))
return; return;
if ((sd->average_char_w <= 0) || (sd->average_char_h <= 0)) if ((sd->average_char_w <= 0) || (sd->average_char_h <= 0))
@ -897,7 +897,7 @@ _e_editable_cursor_update(Evas_Object *editable)
if ((!editable) || (!(sd = evas_object_smart_data_get(editable)))) if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
return; return;
if (!(text_obj = edje_object_part_object_get(sd->text_object, "text"))) if (!(text_obj = edje_object_part_object_get(sd->text_object, "e.text.text")))
return; return;
evas_object_geometry_get(text_obj, &tx, &ty, NULL, NULL); evas_object_geometry_get(text_obj, &tx, &ty, NULL, NULL);
@ -929,7 +929,7 @@ _e_editable_cursor_update(Evas_Object *editable)
if (sd->cursor_visible && evas_object_visible_get(editable)) if (sd->cursor_visible && evas_object_visible_get(editable))
{ {
evas_object_show(sd->cursor_object); evas_object_show(sd->cursor_object);
edje_object_signal_emit(sd->cursor_object, "cursor_show", ""); edje_object_signal_emit(sd->cursor_object, "e,action,show,cursor", "e");
} }
_e_editable_selection_update(editable); _e_editable_selection_update(editable);
@ -949,7 +949,7 @@ _e_editable_selection_update(Evas_Object *editable)
if ((!editable) || (!(sd = evas_object_smart_data_get(editable)))) if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
return; return;
if (!(text_obj = edje_object_part_object_get(sd->text_object, "text"))) if (!(text_obj = edje_object_part_object_get(sd->text_object, "e.text.text")))
return; return;
if ((sd->cursor_pos == sd->selection_pos) || (!sd->selection_visible)) if ((sd->cursor_pos == sd->selection_pos) || (!sd->selection_visible))
@ -1021,12 +1021,12 @@ _e_editable_text_update(Evas_Object *editable)
text = malloc((sd->unicode_length + 1) * sizeof(char)); text = malloc((sd->unicode_length + 1) * sizeof(char));
memset(text, '*', sd->unicode_length * sizeof(char)); memset(text, '*', sd->unicode_length * sizeof(char));
text[sd->unicode_length] = '\0'; text[sd->unicode_length] = '\0';
edje_object_part_text_set(sd->text_object, "text", text); edje_object_part_text_set(sd->text_object, "e.text.text", text);
free(text); free(text);
} }
else else
{ {
edje_object_part_text_set(sd->text_object, "text", edje_object_part_text_set(sd->text_object, "e.text.text",
sd->text ? sd->text : ""); sd->text ? sd->text : "");
} }
@ -1229,7 +1229,7 @@ _e_editable_smart_show(Evas_Object *object)
if (sd->cursor_visible) if (sd->cursor_visible)
{ {
evas_object_show(sd->cursor_object); evas_object_show(sd->cursor_object);
edje_object_signal_emit(sd->cursor_object, "cursor_show", ""); edje_object_signal_emit(sd->cursor_object, "e,action,show,cursor", "e");
} }
if ((sd->selection_visible) && (sd->cursor_pos != sd->selection_pos)) if ((sd->selection_visible) && (sd->cursor_pos != sd->selection_pos))

View File

@ -193,7 +193,7 @@ e_entry_focus(Evas_Object *entry)
return; return;
evas_object_focus_set(entry, 1); evas_object_focus_set(entry, 1);
edje_object_signal_emit(sd->entry_object, "focus_in", ""); edje_object_signal_emit(sd->entry_object, "e,state,focused", "e");
if (sd->enabled) if (sd->enabled)
e_editable_cursor_show(sd->editable_object); e_editable_cursor_show(sd->editable_object);
e_editable_selection_show(sd->editable_object); e_editable_selection_show(sd->editable_object);
@ -218,7 +218,7 @@ e_entry_unfocus(Evas_Object *entry)
return; return;
evas_object_focus_set(entry, 0); evas_object_focus_set(entry, 0);
edje_object_signal_emit(sd->entry_object, "focus_out", ""); edje_object_signal_emit(sd->entry_object, "e,state,unfocused", "e");
e_editable_cursor_move_to_end(sd->editable_object); e_editable_cursor_move_to_end(sd->editable_object);
e_editable_selection_move_to_end(sd->editable_object); e_editable_selection_move_to_end(sd->editable_object);
e_editable_cursor_hide(sd->editable_object); e_editable_cursor_hide(sd->editable_object);
@ -241,7 +241,7 @@ e_entry_enable(Evas_Object *entry)
if (sd->enabled) if (sd->enabled)
return; return;
edje_object_signal_emit(entry, "enabled", ""); edje_object_signal_emit(entry, "e,state,enabled", "e");
if (sd->focused) if (sd->focused)
e_editable_cursor_show(sd->editable_object); e_editable_cursor_show(sd->editable_object);
sd->enabled = 1; sd->enabled = 1;
@ -265,7 +265,7 @@ e_entry_disable(Evas_Object *entry)
if (!sd->enabled) if (!sd->enabled)
return; return;
edje_object_signal_emit(entry, "disabled", ""); edje_object_signal_emit(entry, "e,state,disabled", "e");
e_editable_cursor_hide(sd->editable_object); e_editable_cursor_hide(sd->editable_object);
sd->enabled = 0; sd->enabled = 0;
} }
@ -564,7 +564,7 @@ static void _e_entry_smart_add(Evas_Object *object)
e_editable_cursor_hide(o); e_editable_cursor_hide(o);
e_editable_char_size_get(o, &cw, &ch); e_editable_char_size_get(o, &cw, &ch);
edje_extern_object_min_size_set(o, cw, ch); edje_extern_object_min_size_set(o, cw, ch);
edje_object_part_swallow(sd->entry_object, "text_area", o); edje_object_part_swallow(sd->entry_object, "e.swallow.text", o);
edje_object_size_min_calc(sd->entry_object, &sd->min_width, &sd->height); edje_object_size_min_calc(sd->entry_object, &sd->min_width, &sd->height);
evas_object_show(o); evas_object_show(o);

View File

@ -260,11 +260,11 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
evas_object_resize(o, error_w, error_h); evas_object_resize(o, error_w, error_h);
edje_object_signal_callback_add(o, "close", "", edje_object_signal_callback_add(o, "e,action,close", "",
_e_error_edje_cb_ok_up, ee); _e_error_edje_cb_ok_up, ee);
evas_object_show(o); evas_object_show(o);
edje_object_part_text_set(o, "title", title); edje_object_part_text_set(o, "e.text.title", title);
{ {
char *pp, *newstr, *p, *markup = NULL; char *pp, *newstr, *p, *markup = NULL;
@ -296,7 +296,7 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
else else
p = NULL; p = NULL;
} }
edje_object_part_text_set(o, "text", markup); edje_object_part_text_set(o, "e.text.message", markup);
free(markup); free(markup);
free(newstr); free(newstr);
} }

View File

@ -168,14 +168,14 @@ e_exebuf_show(E_Zone *zone)
bg_object = o; bg_object = o;
e_theme_edje_object_set(o, "base/theme/exebuf", e_theme_edje_object_set(o, "base/theme/exebuf",
"widgets/exebuf/main"); "widgets/exebuf/main");
edje_object_part_text_set(o, "label", cmd_buf); edje_object_part_text_set(o, "e.text.label", cmd_buf);
o = e_box_add(exebuf->evas); o = e_box_add(exebuf->evas);
exe_list_object = o; exe_list_object = o;
e_box_align_set(o, 0.5, 1.0); e_box_align_set(o, 0.5, 1.0);
e_box_orientation_set(o, 0); e_box_orientation_set(o, 0);
e_box_homogenous_set(o, 1); e_box_homogenous_set(o, 1);
edje_object_part_swallow(bg_object, "exe_list_swallow", o); edje_object_part_swallow(bg_object, "e.swallow.exe_list", o);
evas_object_show(o); evas_object_show(o);
o = e_box_add(exebuf->evas); o = e_box_add(exebuf->evas);
@ -183,7 +183,7 @@ e_exebuf_show(E_Zone *zone)
e_box_align_set(o, 0.5, 0.0); e_box_align_set(o, 0.5, 0.0);
e_box_orientation_set(o, 0); e_box_orientation_set(o, 0);
e_box_homogenous_set(o, 1); e_box_homogenous_set(o, 1);
edje_object_part_swallow(bg_object, "eap_list_swallow", o); edje_object_part_swallow(bg_object, "e.swallow.eap_list", o);
evas_object_show(o); evas_object_show(o);
o = bg_object; o = bg_object;
@ -387,7 +387,7 @@ _e_exebuf_update(void)
E_App *a; E_App *a;
Evas_Object *o; Evas_Object *o;
edje_object_part_text_set(bg_object, "label", cmd_buf); edje_object_part_text_set(bg_object, "e.text.label", cmd_buf);
if (icon_object) evas_object_del(icon_object); if (icon_object) evas_object_del(icon_object);
icon_object = NULL; icon_object = NULL;
a = e_app_exe_find(cmd_buf); a = e_app_exe_find(cmd_buf);
@ -397,7 +397,7 @@ _e_exebuf_update(void)
{ {
o = e_app_icon_add(exebuf->evas, a); o = e_app_icon_add(exebuf->evas, a);
icon_object = o; icon_object = o;
edje_object_part_swallow(bg_object, "icon_swallow", o); edje_object_part_swallow(bg_object, "e.swallow.icons", o);
evas_object_show(o); evas_object_show(o);
} }
} }
@ -430,17 +430,17 @@ _e_exebuf_exec(void)
static void static void
_e_exebuf_exe_sel(E_Exebuf_Exe *exe) _e_exebuf_exe_sel(E_Exebuf_Exe *exe)
{ {
edje_object_signal_emit(exe->bg_object, "active", ""); edje_object_signal_emit(exe->bg_object, "e,state,selected", "e");
if (exe->icon_object) if (exe->icon_object)
edje_object_signal_emit(exe->icon_object, "active", ""); edje_object_signal_emit(exe->icon_object, "e,state,selected", "e");
} }
static void static void
_e_exebuf_exe_desel(E_Exebuf_Exe *exe) _e_exebuf_exe_desel(E_Exebuf_Exe *exe)
{ {
edje_object_signal_emit(exe->bg_object, "passive", ""); edje_object_signal_emit(exe->bg_object, "e,state,unselected", "e");
if (exe->icon_object) if (exe->icon_object)
edje_object_signal_emit(exe->icon_object, "passive", ""); edje_object_signal_emit(exe->icon_object, "e,state,unselected", "e");
} }
static void static void
@ -891,13 +891,13 @@ _e_exebuf_matches_update(void)
else if (opt == 0x2) snprintf(buf, sizeof(buf), "%s", exe->app->generic); else if (opt == 0x2) snprintf(buf, sizeof(buf), "%s", exe->app->generic);
else if (opt == 0x1) snprintf(buf, sizeof(buf), "%s", exe->app->comment); else if (opt == 0x1) snprintf(buf, sizeof(buf), "%s", exe->app->comment);
else snprintf(buf, sizeof(buf), "%s", exe->app->name); else snprintf(buf, sizeof(buf), "%s", exe->app->name);
edje_object_part_text_set(o, "title_text", buf); edje_object_part_text_set(o, "e.text.title", buf);
evas_object_show(o); evas_object_show(o);
if (edje_object_part_exists(exe->bg_object, "icon_swallow")) if (edje_object_part_exists(exe->bg_object, "e.swallow.icons"))
{ {
o = e_app_icon_add(exebuf->evas, exe->app); o = e_app_icon_add(exebuf->evas, exe->app);
exe->icon_object = o; exe->icon_object = o;
edje_object_part_swallow(exe->bg_object, "icon_swallow", o); edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o);
evas_object_show(o); evas_object_show(o);
} }
edje_object_size_min_calc(exe->bg_object, &mw, &mh); edje_object_size_min_calc(exe->bg_object, &mw, &mh);
@ -932,9 +932,9 @@ _e_exebuf_matches_update(void)
exe->bg_object = o; exe->bg_object = o;
e_theme_edje_object_set(o, "base/theme/exebuf", e_theme_edje_object_set(o, "base/theme/exebuf",
"widgets/exebuf/item"); "widgets/exebuf/item");
edje_object_part_text_set(o, "title_text", exe->file); edje_object_part_text_set(o, "e.text.title", exe->file);
evas_object_show(o); evas_object_show(o);
if (edje_object_part_exists(exe->bg_object, "icon_swallow")) if (edje_object_part_exists(exe->bg_object, "e.swallow.icons"))
{ {
E_App *a; E_App *a;
@ -943,7 +943,7 @@ _e_exebuf_matches_update(void)
{ {
o = e_app_icon_add(exebuf->evas, a); o = e_app_icon_add(exebuf->evas, a);
exe->icon_object = o; exe->icon_object = o;
edje_object_part_swallow(exe->bg_object, "icon_swallow", o); edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o);
evas_object_show(o); evas_object_show(o);
exe->app = a; exe->app = a;
e_object_ref(E_OBJECT(exe->app)); e_object_ref(E_OBJECT(exe->app));

View File

@ -691,7 +691,7 @@ _e_fm2_scan_start(Evas_Object *obj)
if ((sd->scan_idler) || (sd->scan_timer)) return; if ((sd->scan_idler) || (sd->scan_timer)) return;
sd->scan_idler = ecore_idler_add(_e_fm2_cb_scan_idler, obj); sd->scan_idler = ecore_idler_add(_e_fm2_cb_scan_idler, obj);
sd->scan_timer = ecore_timer_add(0.2, _e_fm2_cb_scan_timer, obj); sd->scan_timer = ecore_timer_add(0.2, _e_fm2_cb_scan_timer, obj);
edje_object_signal_emit(sd->overlay, "busy", "start"); edje_object_signal_emit(sd->overlay, "e,state,busy,start", "e");
} }
static void static void
@ -702,7 +702,7 @@ _e_fm2_scan_stop(Evas_Object *obj)
sd = evas_object_smart_data_get(obj); sd = evas_object_smart_data_get(obj);
if (!sd) return; if (!sd) return;
if (sd->dir) if (sd->dir)
edje_object_signal_emit(sd->overlay, "busy", "stop"); edje_object_signal_emit(sd->overlay, "e,state,busy,stop", "e");
/* stop the scan idler, the sort timer and free the queue */ /* stop the scan idler, the sort timer and free the queue */
if (sd->dir) if (sd->dir)
{ {
@ -831,7 +831,7 @@ _e_fm2_queue_process(Evas_Object *obj)
// ecore_time_get() - tt, evas_list_count(sd->icons), queued, // ecore_time_get() - tt, evas_list_count(sd->icons), queued,
// added, sd->tmp.iter); // added, sd->tmp.iter);
snprintf(buf, sizeof(buf), _("%i Files"), evas_list_count(sd->icons)); snprintf(buf, sizeof(buf), _("%i Files"), evas_list_count(sd->icons));
edje_object_part_text_set(sd->overlay, "busy_label", buf); edje_object_part_text_set(sd->overlay, "e.text.busy_label", buf);
/* FIXME: this could get a lot faster - avoid it or something. scan /* FIXME: this could get a lot faster - avoid it or something. scan
speed goes from 200-250 files/0.2 sec to 80 or so in my tests */ speed goes from 200-250 files/0.2 sec to 80 or so in my tests */
if (sd->resize_job) ecore_job_del(sd->resize_job); if (sd->resize_job) ecore_job_del(sd->resize_job);
@ -1278,7 +1278,7 @@ _e_fm2_icon_new(E_Fm2_Smart_Data *sd, char *file)
} }
edje_extern_object_min_size_set(obj2, sd->config->icon.list.w, sd->config->icon.list.h); edje_extern_object_min_size_set(obj2, sd->config->icon.list.w, sd->config->icon.list.h);
edje_extern_object_max_size_set(obj2, sd->config->icon.list.w, sd->config->icon.list.h); edje_extern_object_max_size_set(obj2, sd->config->icon.list.w, sd->config->icon.list.h);
edje_object_part_swallow(obj, "icon_swallow", obj2); edje_object_part_swallow(obj, "e.swallow.icon", obj2);
edje_object_size_min_calc(obj, &mw, &mh); edje_object_size_min_calc(obj, &mw, &mh);
} }
if (mw < sd->w) ic->w = sd->w; if (mw < sd->w) ic->w = sd->w;
@ -1389,8 +1389,8 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic)
if (ic->selected) if (ic->selected)
{ {
/* FIXME: need new signal to INSTANTLY activate - no anim */ /* FIXME: need new signal to INSTANTLY activate - no anim */
edje_object_signal_emit(ic->obj, "active", ""); edje_object_signal_emit(ic->obj, "e,state,selected", "e");
edje_object_signal_emit(ic->obj_icon, "active", ""); edje_object_signal_emit(ic->obj_icon, "e,state,selected", "e");
} }
} }
@ -1428,12 +1428,12 @@ _e_fm2_icon_label_set(E_Fm2_Icon *ic, Evas_Object *obj)
if (ic->info.label) if (ic->info.label)
{ {
edje_object_part_text_set(obj, "label", ic->info.label); edje_object_part_text_set(obj, "e.text.label", ic->info.label);
return; return;
} }
if ((ic->sd->config->icon.extension.show) || if ((ic->sd->config->icon.extension.show) ||
(S_ISDIR(ic->info.statinfo.st_mode))) (S_ISDIR(ic->info.statinfo.st_mode)))
edje_object_part_text_set(obj, "label", ic->info.file); edje_object_part_text_set(obj, "e.text.label", ic->info.file);
else else
{ {
/* remove extension. handle double extensions like .tar.gz too /* remove extension. handle double extensions like .tar.gz too
@ -1453,7 +1453,7 @@ _e_fm2_icon_label_set(E_Fm2_Icon *ic, Evas_Object *obj)
p = strrchr(buf, '.'); p = strrchr(buf, '.');
if ((p) && ((len - (p - buf)) < 6)) *p = 0; if ((p) && ((len - (p - buf)) < 6)) *p = 0;
} }
edje_object_part_text_set(obj, "label", buf); edje_object_part_text_set(obj, "e.text.label", buf);
} }
} }
@ -1476,7 +1476,7 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic)
/* theme icon */ /* theme icon */
ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj)); ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj));
e_util_edje_icon_set(ic->obj_icon, ic->info.icon); e_util_edje_icon_set(ic->obj_icon, ic->info.icon);
edje_object_part_swallow(ic->obj, "icon_swallow", ic->obj_icon); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
evas_object_show(ic->obj_icon); evas_object_show(ic->obj_icon);
return; return;
} }
@ -1498,7 +1498,7 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic)
e_thumb_icon_size_set(ic->obj_icon, 64, 64); e_thumb_icon_size_set(ic->obj_icon, 64, 64);
evas_object_smart_callback_add(ic->obj_icon, "e_thumb_gen", _e_fm2_cb_icon_thumb_gen, ic); evas_object_smart_callback_add(ic->obj_icon, "e_thumb_gen", _e_fm2_cb_icon_thumb_gen, ic);
_e_fm2_icon_thumb(ic); _e_fm2_icon_thumb(ic);
edje_object_part_swallow(ic->obj, "icon_swallow", ic->obj_icon); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
evas_object_show(ic->obj_icon); evas_object_show(ic->obj_icon);
} }
else else
@ -1515,7 +1515,7 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic)
buf)) buf))
e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman", e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman",
"icons/fileman/file"); "icons/fileman/file");
edje_object_part_swallow(ic->obj, "icon_swallow", ic->obj_icon); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
evas_object_show(ic->obj_icon); evas_object_show(ic->obj_icon);
} }
return; return;
@ -1526,7 +1526,7 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic)
ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj)); ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj));
e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman", e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman",
"icons/fileman/folder"); "icons/fileman/folder");
edje_object_part_swallow(ic->obj, "icon_swallow", ic->obj_icon); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
evas_object_show(ic->obj_icon); evas_object_show(ic->obj_icon);
} }
else else
@ -1541,7 +1541,7 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic)
e_thumb_icon_size_set(ic->obj_icon, 64, 48); e_thumb_icon_size_set(ic->obj_icon, 64, 48);
evas_object_smart_callback_add(ic->obj_icon, "e_thumb_gen", _e_fm2_cb_icon_thumb_gen, ic); evas_object_smart_callback_add(ic->obj_icon, "e_thumb_gen", _e_fm2_cb_icon_thumb_gen, ic);
_e_fm2_icon_thumb(ic); _e_fm2_icon_thumb(ic);
edje_object_part_swallow(ic->obj, "icon_swallow", ic->obj_icon); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
evas_object_show(ic->obj_icon); evas_object_show(ic->obj_icon);
} }
else if ( else if (
@ -1554,7 +1554,7 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic)
e_thumb_icon_size_set(ic->obj_icon, 64, 64); e_thumb_icon_size_set(ic->obj_icon, 64, 64);
evas_object_smart_callback_add(ic->obj_icon, "e_thumb_gen", _e_fm2_cb_icon_thumb_gen, ic); evas_object_smart_callback_add(ic->obj_icon, "e_thumb_gen", _e_fm2_cb_icon_thumb_gen, ic);
_e_fm2_icon_thumb(ic); _e_fm2_icon_thumb(ic);
edje_object_part_swallow(ic->obj, "icon_swallow", ic->obj_icon); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
evas_object_show(ic->obj_icon); evas_object_show(ic->obj_icon);
} }
else else
@ -1562,7 +1562,7 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic)
ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj)); ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj));
e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman", e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman",
"icons/fileman/file"); "icons/fileman/file");
edje_object_part_swallow(ic->obj, "icon_swallow", ic->obj_icon); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
evas_object_show(ic->obj_icon); evas_object_show(ic->obj_icon);
} }
} }
@ -1586,8 +1586,8 @@ _e_fm2_icon_select(E_Fm2_Icon *ic)
ic->last_selected = 1; ic->last_selected = 1;
if (ic->realized) if (ic->realized)
{ {
edje_object_signal_emit(ic->obj, "active", ""); edje_object_signal_emit(ic->obj, "e,state,selected", "e");
edje_object_signal_emit(ic->obj_icon, "active", ""); edje_object_signal_emit(ic->obj_icon, "e,state,selected", "e");
evas_object_stack_below(ic->obj, ic->sd->overlay); evas_object_stack_below(ic->obj, ic->sd->overlay);
} }
} }
@ -1600,8 +1600,8 @@ _e_fm2_icon_deselect(E_Fm2_Icon *ic)
ic->last_selected = 0; ic->last_selected = 0;
if (ic->realized) if (ic->realized)
{ {
edje_object_signal_emit(ic->obj, "passive", ""); edje_object_signal_emit(ic->obj, "e,state,unselected", "e");
edje_object_signal_emit(ic->obj_icon, "passive", ""); edje_object_signal_emit(ic->obj_icon, "e,state,unselected", "e");
} }
} }
@ -1920,11 +1920,11 @@ _e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, void *event_info)
edje_extern_object_aspect_set(ic->obj_icon, edje_extern_object_aspect_set(ic->obj_icon,
EDJE_ASPECT_CONTROL_BOTH, w, h); EDJE_ASPECT_CONTROL_BOTH, w, h);
} }
edje_object_part_swallow(ic->obj, "icon_swallow", ic->obj_icon); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
if (have_alpha) if (have_alpha)
edje_object_signal_emit(ic->obj, "thumb", "gen_alpha"); edje_object_signal_emit(ic->obj, "e,action,thumb,gen,alpha", "e");
else else
edje_object_signal_emit(ic->obj, "thumb", "gen"); edje_object_signal_emit(ic->obj, "e,action,thumb,gen", "e");
} }
} }

View File

@ -582,7 +582,7 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *
0, 0, /* min */ 0, 0, /* min */
-1, -1 /* max */ -1, -1 /* max */
); );
edje_object_part_swallow(gcc->o_frame, "items", gcc->o_box); edje_object_part_swallow(gcc->o_frame, gc->edje.swallow_name, gcc->o_box);
evas_object_show(gcc->o_box); evas_object_show(gcc->o_box);
evas_object_show(gcc->o_frame); evas_object_show(gcc->o_frame);
} }
@ -1431,7 +1431,7 @@ _e_gadcon_cb_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info
gcc = data; gcc = data;
ev = event_info; ev = event_info;
edje_object_signal_emit(gcc->o_control, "active", ""); edje_object_signal_emit(gcc->o_control, "e,state,focused", "e");
} }
static void static void
@ -1442,7 +1442,7 @@ _e_gadcon_cb_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_inf
gcc = data; gcc = data;
ev = event_info; ev = event_info;
edje_object_signal_emit(gcc->o_control, "inactive", ""); edje_object_signal_emit(gcc->o_control, "e,state,unfocused", "e");
} }
static void static void

View File

@ -79,7 +79,7 @@ e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
Evas_Coord mw = 0, mh = 0; Evas_Coord mw = 0, mh = 0;
edje_extern_object_min_size_set(si->icon_obj, sd->icon_w, sd->icon_h); edje_extern_object_min_size_set(si->icon_obj, sd->icon_w, sd->icon_h);
edje_object_part_swallow(si->base_obj, "icon_swallow", si->icon_obj); edje_object_part_swallow(si->base_obj, "e.swallow.icon", si->icon_obj);
edje_object_size_min_calc(si->base_obj, &mw, &mh); edje_object_size_min_calc(si->base_obj, &mw, &mh);
e_box_pack_options_set(si->icon_obj, e_box_pack_options_set(si->icon_obj,
1, 1, /* fill */ 1, 1, /* fill */
@ -112,12 +112,12 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, int heade
else else
e_theme_edje_object_set(si->base_obj, "base/theme/widgets", e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
"widgets/ilist"); "widgets/ilist");
edje_object_part_text_set(si->base_obj, "label", label); edje_object_part_text_set(si->base_obj, "e.text.label", label);
si->icon_obj = icon; si->icon_obj = icon;
if (si->icon_obj) if (si->icon_obj)
{ {
edje_extern_object_min_size_set(si->icon_obj, sd->icon_w, sd->icon_h); edje_extern_object_min_size_set(si->icon_obj, sd->icon_w, sd->icon_h);
edje_object_part_swallow(si->base_obj, "icon_swallow", si->icon_obj); edje_object_part_swallow(si->base_obj, "e.swallow.icon", si->icon_obj);
evas_object_show(si->icon_obj); evas_object_show(si->icon_obj);
} }
si->func = func; si->func = func;
@ -152,13 +152,13 @@ e_ilist_selected_set(Evas_Object *obj, int n)
else if (n < 0) n = 0; else if (n < 0) n = 0;
if (sd->selected == n) return; if (sd->selected == n) return;
si = evas_list_nth(sd->items, sd->selected); si = evas_list_nth(sd->items, sd->selected);
if (si) edje_object_signal_emit(si->base_obj, "passive", ""); if (si) edje_object_signal_emit(si->base_obj, "e,state,unselected", "e");
sd->selected = n; sd->selected = n;
si = evas_list_nth(sd->items, sd->selected); si = evas_list_nth(sd->items, sd->selected);
if (si) if (si)
{ {
evas_object_raise(si->base_obj); evas_object_raise(si->base_obj);
edje_object_signal_emit(si->base_obj, "active", ""); edje_object_signal_emit(si->base_obj, "e,state,selected", "e");
if (si->func_hilight) si->func_hilight(si->data, si->data2); if (si->func_hilight) si->func_hilight(si->data, si->data2);
if (!sd->selector) if (!sd->selector)
{ {
@ -183,7 +183,7 @@ e_ilist_selected_label_get(Evas_Object *obj)
API_ENTRY return NULL; API_ENTRY return NULL;
if (!sd->items) return NULL; if (!sd->items) return NULL;
si = evas_list_nth(sd->items, sd->selected); si = evas_list_nth(sd->items, sd->selected);
if (si) return edje_object_part_text_get(si->base_obj, "label"); if (si) return edje_object_part_text_get(si->base_obj, "e.text.label");
return NULL; return NULL;
} }
@ -294,7 +294,7 @@ e_ilist_remove_label(Evas_Object *obj, const char *label)
if (si) if (si)
{ {
char *t; char *t;
t = strdup(edje_object_part_text_get(si->base_obj, "label")); t = strdup(edje_object_part_text_get(si->base_obj, "e.text.label"));
if (!strcmp(t, label)) if (!strcmp(t, label))
{ {
if (si->icon_obj) evas_object_del(si->icon_obj); if (si->icon_obj) evas_object_del(si->icon_obj);
@ -316,7 +316,7 @@ e_ilist_nth_label_get(Evas_Object *obj, int n)
API_ENTRY return NULL; API_ENTRY return NULL;
if (!sd->items) return NULL; if (!sd->items) return NULL;
si = evas_list_nth(sd->items, n); si = evas_list_nth(sd->items, n);
if (si) return edje_object_part_text_get(si->base_obj, "label"); if (si) return edje_object_part_text_get(si->base_obj, "e.text.label");
return NULL; return NULL;
} }
@ -328,7 +328,7 @@ e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
API_ENTRY return; API_ENTRY return;
if (!sd->items) return; if (!sd->items) return;
si = evas_list_nth(sd->items, n); si = evas_list_nth(sd->items, n);
if (si) edje_object_part_text_set(si->base_obj, "label", label); if (si) edje_object_part_text_set(si->base_obj, "e.text.label", label);
} }
EAPI Evas_Object * EAPI Evas_Object *
@ -364,7 +364,7 @@ e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
if (si->icon_obj) if (si->icon_obj)
{ {
edje_extern_object_min_size_set(si->icon_obj, sd->icon_w, sd->icon_h); edje_extern_object_min_size_set(si->icon_obj, sd->icon_w, sd->icon_h);
edje_object_part_swallow(si->base_obj, "icon_swallow", si->icon_obj); edje_object_part_swallow(si->base_obj, "e.swallow.icon", si->icon_obj);
evas_object_show(si->icon_obj); evas_object_show(si->icon_obj);
} }
} }

View File

@ -669,7 +669,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
if ((maximized == 2) && if ((maximized == 2) &&
(e_config->maximize_policy == E_MAXIMIZE_FULLSCREEN)) (e_config->maximize_policy == E_MAXIMIZE_FULLSCREEN))
{ {
signal = "maximize,fullscreen"; signal = "e,action,maximize,fullscreen";
key = "maximize,fullscreen"; key = "maximize,fullscreen";
} }
free(state); free(state);
@ -693,7 +693,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
if (signal) if (signal)
{ {
edje_object_signal_emit(o, signal, ""); edje_object_signal_emit(o, signal, "e");
edje_object_message_signal_process(o); edje_object_message_signal_process(o);
} }

View File

@ -684,33 +684,33 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog)
{ {
mi->toggle = 1; mi->toggle = 1;
if (mi->bg_object) if (mi->bg_object)
edje_object_signal_emit(mi->bg_object, "toggle_on", ""); edje_object_signal_emit(mi->bg_object, "e,state,on", "e");
if (mi->icon_bg_object) if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "toggle_on", ""); edje_object_signal_emit(mi->icon_bg_object, "e,state,on", "e");
if (mi->label_object) if (mi->label_object)
edje_object_signal_emit(mi->label_object, "toggle_on", ""); edje_object_signal_emit(mi->label_object, "e,state,on", "e");
if (mi->submenu_object) if (mi->submenu_object)
edje_object_signal_emit(mi->submenu_object, "toggle_on", ""); edje_object_signal_emit(mi->submenu_object, "e,state,on", "e");
if (mi->toggle_object) if (mi->toggle_object)
edje_object_signal_emit(mi->toggle_object, "toggle_on", ""); edje_object_signal_emit(mi->toggle_object, "e,state,on", "e");
if (mi->menu->bg_object) if (mi->menu->bg_object)
edje_object_signal_emit(mi->menu->bg_object, "toggle_on", ""); edje_object_signal_emit(mi->menu->bg_object, "e,state,on", "e");
} }
else else
{ {
mi->toggle = 0; mi->toggle = 0;
if (mi->bg_object) if (mi->bg_object)
edje_object_signal_emit(mi->bg_object, "toggle_off", ""); edje_object_signal_emit(mi->bg_object, "e,state,off", "e");
if (mi->icon_bg_object) if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "toggle_off", ""); edje_object_signal_emit(mi->icon_bg_object, "e,state,off", "e");
if (mi->label_object) if (mi->label_object)
edje_object_signal_emit(mi->label_object, "toggle_off", ""); edje_object_signal_emit(mi->label_object, "e,state,off", "e");
if (mi->submenu_object) if (mi->submenu_object)
edje_object_signal_emit(mi->submenu_object, "toggle_off", ""); edje_object_signal_emit(mi->submenu_object, "e,state,off", "e");
if (mi->toggle_object) if (mi->toggle_object)
edje_object_signal_emit(mi->toggle_object, "toggle_off", ""); edje_object_signal_emit(mi->toggle_object, "e,state,off", "e");
if (mi->menu->bg_object) if (mi->menu->bg_object)
edje_object_signal_emit(mi->menu->bg_object, "toggle_off", ""); edje_object_signal_emit(mi->menu->bg_object, "e,state,off", "e");
} }
if (tog) if (tog)
{ {
@ -794,18 +794,18 @@ e_menu_item_active_set(E_Menu_Item *mi, int active)
mi->active = 1; mi->active = 1;
_e_active_menu_item = mi; _e_active_menu_item = mi;
if (mi->bg_object) if (mi->bg_object)
edje_object_signal_emit(mi->bg_object, "active", ""); edje_object_signal_emit(mi->bg_object, "e,state,selected", "e");
if (mi->icon_bg_object) if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "active", ""); edje_object_signal_emit(mi->icon_bg_object, "e,state,selected", "e");
if (mi->label_object) if (mi->label_object)
edje_object_signal_emit(mi->label_object, "active", ""); edje_object_signal_emit(mi->label_object, "e,state,selected", "e");
if (mi->submenu_object) if (mi->submenu_object)
edje_object_signal_emit(mi->submenu_object, "active", ""); edje_object_signal_emit(mi->submenu_object, "e,state,selected", "e");
if (mi->toggle_object) if (mi->toggle_object)
edje_object_signal_emit(mi->toggle_object, "active", ""); edje_object_signal_emit(mi->toggle_object, "e,state,selected", "e");
if (mi->icon_key) if (mi->icon_key)
edje_object_signal_emit(mi->icon_object, "active", ""); edje_object_signal_emit(mi->icon_object, "e,state,selected", "e");
edje_object_signal_emit(mi->menu->bg_object, "active", ""); edje_object_signal_emit(mi->menu->bg_object, "e,state,selected", "e");
_e_menu_submenu_activate(mi); _e_menu_submenu_activate(mi);
} }
else if ((!active) && (mi->active)) else if ((!active) && (mi->active))
@ -813,18 +813,18 @@ e_menu_item_active_set(E_Menu_Item *mi, int active)
mi->active = 0; mi->active = 0;
_e_active_menu_item = NULL; _e_active_menu_item = NULL;
if (mi->bg_object) if (mi->bg_object)
edje_object_signal_emit(mi->bg_object, "passive", ""); edje_object_signal_emit(mi->bg_object, "e,state,unselected", "e");
if (mi->icon_bg_object) if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "passive", ""); edje_object_signal_emit(mi->icon_bg_object, "e,state,unselected", "e");
if (mi->label_object) if (mi->label_object)
edje_object_signal_emit(mi->label_object, "passive", ""); edje_object_signal_emit(mi->label_object, "e,state,unselected", "e");
if (mi->submenu_object) if (mi->submenu_object)
edje_object_signal_emit(mi->submenu_object, "passive", ""); edje_object_signal_emit(mi->submenu_object, "e,state,unselected", "e");
if (mi->toggle_object) if (mi->toggle_object)
edje_object_signal_emit(mi->toggle_object, "passive", ""); edje_object_signal_emit(mi->toggle_object, "e,state,unselected", "e");
if (mi->icon_key) if (mi->icon_key)
edje_object_signal_emit(mi->icon_object, "passive", ""); edje_object_signal_emit(mi->icon_object, "e,state,unselected", "e");
edje_object_signal_emit(mi->menu->bg_object, "passive", ""); edje_object_signal_emit(mi->menu->bg_object, "e,state,unselected", "e");
_e_menu_submenu_deactivate(mi); _e_menu_submenu_deactivate(mi);
} }
} }
@ -1260,14 +1260,14 @@ _e_menu_item_realize(E_Menu_Item *mi)
{ {
edje_extern_object_min_size_set(mi->icon_object, edje_extern_object_min_size_set(mi->icon_object,
icon_w, icon_h); icon_w, icon_h);
edje_object_part_swallow(mi->icon_bg_object, "item", edje_object_part_swallow(mi->icon_bg_object, "e.swallow.content",
mi->icon_object); mi->icon_object);
edje_object_size_min_calc(mi->icon_bg_object, &ww, &hh); edje_object_size_min_calc(mi->icon_bg_object, &ww, &hh);
mi->icon_w = ww; mi->icon_w = ww;
mi->icon_h = hh; mi->icon_h = hh;
edje_extern_object_min_size_set(mi->icon_object, 0, 0); edje_extern_object_min_size_set(mi->icon_object, 0, 0);
edje_object_part_swallow(mi->icon_bg_object, "item", edje_object_part_swallow(mi->icon_bg_object, "e.swallow.content",
mi->icon_object); mi->icon_object);
e_box_pack_end(mi->container_object, mi->icon_bg_object); e_box_pack_end(mi->container_object, mi->icon_bg_object);
} }
@ -1298,7 +1298,7 @@ _e_menu_item_realize(E_Menu_Item *mi)
e_theme_edje_object_set(o, "base/theme/menus", e_theme_edje_object_set(o, "base/theme/menus",
"widgets/menu/default/label"); "widgets/menu/default/label");
/* default label */ /* default label */
edje_object_part_text_set(o, "label", mi->label); edje_object_part_text_set(o, "e.text.label", mi->label);
evas_object_pass_events_set(o, 1); evas_object_pass_events_set(o, 1);
evas_object_show(o); evas_object_show(o);
e_box_pack_end(mi->container_object, o); e_box_pack_end(mi->container_object, o);
@ -1336,7 +1336,7 @@ _e_menu_item_realize(E_Menu_Item *mi)
e_box_pack_end(mi->container_object, o); e_box_pack_end(mi->container_object, o);
} }
edje_object_part_swallow(mi->bg_object, "item", mi->container_object); edje_object_part_swallow(mi->bg_object, "e.swallow.content", mi->container_object);
o = evas_object_rectangle_add(mi->menu->evas); o = evas_object_rectangle_add(mi->menu->evas);
evas_object_color_set(o, 0, 0, 0, 0); evas_object_color_set(o, 0, 0, 0, 0);
@ -1406,8 +1406,8 @@ _e_menu_realize(E_Menu *m)
} }
if (m->header.title) if (m->header.title)
{ {
edje_object_part_text_set(o, "title", m->header.title); edje_object_part_text_set(o, "e.text.title", m->header.title);
edje_object_signal_emit(o, "title,on", ""); edje_object_signal_emit(o, "e,action,show,title", "e");
edje_object_message_signal_process(o); edje_object_message_signal_process(o);
} }
evas_object_show(o); evas_object_show(o);
@ -1422,7 +1422,7 @@ _e_menu_realize(E_Menu *m)
e_box_freeze(o); e_box_freeze(o);
evas_object_show(o); evas_object_show(o);
e_box_homogenous_set(o, 0); e_box_homogenous_set(o, 0);
edje_object_part_swallow(m->bg_object, "items", m->container_object); edje_object_part_swallow(m->bg_object, "e.swallow.content", m->container_object);
for (l = m->items; l; l = l->next) for (l = m->items; l; l = l->next)
@ -1617,7 +1617,7 @@ _e_menu_items_layout_update(E_Menu *m)
0, 0 /* max */ 0, 0 /* max */
); );
edje_extern_object_min_size_set(mi->container_object, min_w, min_h); edje_extern_object_min_size_set(mi->container_object, min_w, min_h);
edje_object_part_swallow(mi->bg_object, "item", mi->container_object); edje_object_part_swallow(mi->bg_object, "e.swallow.content", mi->container_object);
edje_object_size_min_calc(mi->bg_object, &mw, &mh); edje_object_size_min_calc(mi->bg_object, &mw, &mh);
e_box_pack_options_set(mi->bg_object, e_box_pack_options_set(mi->bg_object,
1, 1, /* fill */ 1, 1, /* fill */
@ -1632,7 +1632,7 @@ _e_menu_items_layout_update(E_Menu *m)
e_box_min_size_get(m->container_object, &bw, &bh); e_box_min_size_get(m->container_object, &bw, &bh);
edje_extern_object_min_size_set(m->container_object, bw, bh); edje_extern_object_min_size_set(m->container_object, bw, bh);
edje_extern_object_max_size_set(m->container_object, bw, bh); edje_extern_object_max_size_set(m->container_object, bw, bh);
edje_object_part_swallow(m->bg_object, "items", m->container_object); edje_object_part_swallow(m->bg_object, "e.swallow.content", m->container_object);
edje_object_size_min_calc(m->bg_object, &mw, &mh); edje_object_size_min_calc(m->bg_object, &mw, &mh);
e_box_thaw(m->container_object); e_box_thaw(m->container_object);
m->cur.w = mw; m->cur.w = mw;

View File

@ -30,7 +30,7 @@ e_resize_begin(E_Zone *zone, int w, int h)
e_theme_edje_object_set(_obj, "base/theme/borders", e_theme_edje_object_set(_obj, "base/theme/borders",
"widgets/border/default/resize"); "widgets/border/default/resize");
snprintf(buf, sizeof(buf), "9999x9999"); snprintf(buf, sizeof(buf), "9999x9999");
edje_object_part_text_set(_obj, "text", buf); edje_object_part_text_set(_obj, "e.text.label", buf);
edje_object_size_min_calc(_obj, &ew, &eh); edje_object_size_min_calc(_obj, &ew, &eh);
evas_object_move(_obj, 0, 0); evas_object_move(_obj, 0, 0);
@ -88,7 +88,7 @@ e_resize_update(int w, int h)
visible = 1; visible = 1;
} }
snprintf(buf, sizeof(buf), "%ix%i", w, h); snprintf(buf, sizeof(buf), "%ix%i", w, h);
edje_object_part_text_set(_obj, "text", buf); edje_object_part_text_set(_obj, "e.text.label", buf);
} }
EAPI void EAPI void
@ -107,7 +107,7 @@ e_move_begin(E_Zone *zone, int x, int y)
e_theme_edje_object_set(_obj, "base/theme/borders", e_theme_edje_object_set(_obj, "base/theme/borders",
"widgets/border/default/move"); "widgets/border/default/move");
snprintf(buf, sizeof(buf), "9999 9999"); snprintf(buf, sizeof(buf), "9999 9999");
edje_object_part_text_set(_obj, "text", buf); edje_object_part_text_set(_obj, "e.text.label", buf);
edje_object_size_min_calc(_obj, &ew, &eh); edje_object_size_min_calc(_obj, &ew, &eh);
evas_object_move(_obj, 0, 0); evas_object_move(_obj, 0, 0);
@ -165,7 +165,7 @@ e_move_update(int x, int y)
visible = 1; visible = 1;
} }
snprintf(buf, sizeof(buf), "%i %i", x, y); snprintf(buf, sizeof(buf), "%i %i", x, y);
edje_object_part_text_set(_obj, "text", buf); edje_object_part_text_set(_obj, "e.text.label", buf);
} }
EAPI void EAPI void

View File

@ -332,7 +332,7 @@ _e_pointer_type_set(E_Pointer *p, const char *type)
if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor)) if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor))
goto fallback; goto fallback;
} }
edje_object_part_swallow(p->pointer_object, "hotspot", p->hot_object); edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", p->hot_object);
p->hot.update = 1; p->hot.update = 1;
return 1; return 1;
} }

View File

@ -184,8 +184,8 @@ e_scrollframe_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
else vy = 0.0; else vy = 0.0;
if (vy < 0.0) vy = 0.0; if (vy < 0.0) vy = 0.0;
else if (vy > 1.0) vy = 1.0; else if (vy > 1.0) vy = 1.0;
edje_object_part_drag_value_set(sd->edje_obj, "vbar_bar", 0.0, vy); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.vbar", 0.0, vy);
edje_object_part_drag_value_set(sd->edje_obj, "hbar_bar", vx, 0.0); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.hbar", vx, 0.0);
sd->pan_func.set(sd->pan_obj, x, y); sd->pan_func.set(sd->pan_obj, x, y);
} }
@ -411,8 +411,8 @@ _e_smart_scrollbar_read(E_Smart_Data *sd)
Evas_Coord x, y, mx = 0, my = 0; Evas_Coord x, y, mx = 0, my = 0;
double vx, vy; double vx, vy;
edje_object_part_drag_value_get(sd->edje_obj, "vbar_bar", NULL, &vy); edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.vbar", NULL, &vy);
edje_object_part_drag_value_get(sd->edje_obj, "hbar_bar", &vx, NULL); edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.hbar", &vx, NULL);
sd->pan_func.max_get(sd->pan_obj, &mx, &my); sd->pan_func.max_get(sd->pan_obj, &mx, &my);
x = vx * (double)mx; x = vx * (double)mx;
y = vy * (double)my; y = vy * (double)my;
@ -422,12 +422,12 @@ _e_smart_scrollbar_read(E_Smart_Data *sd)
static void static void
_e_smart_scrollbar_reset(E_Smart_Data *sd) _e_smart_scrollbar_reset(E_Smart_Data *sd)
{ {
edje_object_part_drag_value_set(sd->edje_obj, "vbar_bar", 0.0, 0.0); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.vbar", 0.0, 0.0);
edje_object_part_drag_value_set(sd->edje_obj, "hbar_bar", 0.0, 0.0); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.hbar", 0.0, 0.0);
if ((!sd->child_obj) && (!sd->extern_pan)) if ((!sd->child_obj) && (!sd->extern_pan))
{ {
edje_object_part_drag_size_set(sd->edje_obj, "vbar_bar", 1.0, 1.0); edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", 1.0, 1.0);
edje_object_part_drag_size_set(sd->edje_obj, "hbar_bar", 1.0, 1.0); edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", 1.0, 1.0);
} }
sd->pan_func.set(sd->pan_obj, 0, 0); sd->pan_func.set(sd->pan_obj, 0, 0);
} }
@ -487,9 +487,9 @@ _e_smart_scrollbar_bar_v_visibility_adjust(E_Smart_Data *sd)
if (scroll_v_vis_change) if (scroll_v_vis_change)
{ {
if (sd->vbar_visible) if (sd->vbar_visible)
edje_object_signal_emit(sd->edje_obj, "vbar", "show"); edje_object_signal_emit(sd->edje_obj, "e,action,show,vbar", "e");
else else
edje_object_signal_emit(sd->edje_obj, "vbar", "hide"); edje_object_signal_emit(sd->edje_obj, "e,action,hide,vbar", "e");
edje_object_message_signal_process(sd->edje_obj); edje_object_message_signal_process(sd->edje_obj);
_e_smart_scrollbar_size_adjust(sd); _e_smart_scrollbar_size_adjust(sd);
} }
@ -551,9 +551,9 @@ _e_smart_scrollbar_bar_h_visibility_adjust(E_Smart_Data *sd)
if (scroll_h_vis_change) if (scroll_h_vis_change)
{ {
if (sd->hbar_visible) if (sd->hbar_visible)
edje_object_signal_emit(sd->edje_obj, "hbar", "show"); edje_object_signal_emit(sd->edje_obj, "e,action,show,hbar", "e");
else else
edje_object_signal_emit(sd->edje_obj, "hbar", "hide"); edje_object_signal_emit(sd->edje_obj, "e,action,hide,hbar", "e");
edje_object_message_signal_process(sd->edje_obj); edje_object_message_signal_process(sd->edje_obj);
_e_smart_scrollbar_size_adjust(sd); _e_smart_scrollbar_size_adjust(sd);
} }
@ -589,9 +589,9 @@ _e_smart_scrollbar_size_adjust(E_Smart_Data *sd)
if (size > 1.0) if (size > 1.0)
{ {
size = 1.0; size = 1.0;
edje_object_part_drag_value_set(sd->edje_obj, "hbar_bar", 0.0, 0.0); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.hbar", 0.0, 0.0);
} }
edje_object_part_drag_size_set(sd->edje_obj, "hbar_bar", size, 1.0); edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", size, 1.0);
h = sd->child.h; h = sd->child.h;
if (h < 1) h = 1; if (h < 1) h = 1;
@ -599,33 +599,33 @@ _e_smart_scrollbar_size_adjust(E_Smart_Data *sd)
if (size > 1.0) if (size > 1.0)
{ {
size = 1.0; size = 1.0;
edje_object_part_drag_value_set(sd->edje_obj, "vbar_bar", 0.0, 0.0); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.vbar", 0.0, 0.0);
} }
edje_object_part_drag_size_set(sd->edje_obj, "vbar_bar", 1.0, size); edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", 1.0, size);
edje_object_part_drag_value_get(sd->edje_obj, "hbar_bar", &vx, NULL); edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.hbar", &vx, NULL);
edje_object_part_drag_value_get(sd->edje_obj, "vbar_bar", NULL, &vy); edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.vbar", NULL, &vy);
sd->pan_func.max_get(sd->pan_obj, &mx, &my); sd->pan_func.max_get(sd->pan_obj, &mx, &my);
x = vx * mx; x = vx * mx;
y = vy * my; y = vy * my;
edje_object_part_drag_step_set(sd->edje_obj, "hbar_bar", (double)sd->step.x / (double)w, 0.0); edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.hbar", (double)sd->step.x / (double)w, 0.0);
edje_object_part_drag_step_set(sd->edje_obj, "vbar_bar", 0.0, (double)sd->step.y / (double)h); edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.vbar", 0.0, (double)sd->step.y / (double)h);
if (sd->page.x > 0) if (sd->page.x > 0)
edje_object_part_drag_page_set(sd->edje_obj, "hbar_bar", (double)sd->page.x / (double)w, 0.0); edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.hbar", (double)sd->page.x / (double)w, 0.0);
else else
edje_object_part_drag_page_set(sd->edje_obj, "hbar_bar", -((double)sd->page.x * ((double)vw / (double)w)) / 100.0, 0.0); edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.hbar", -((double)sd->page.x * ((double)vw / (double)w)) / 100.0, 0.0);
if (sd->page.y > 0) if (sd->page.y > 0)
edje_object_part_drag_page_set(sd->edje_obj, "vbar_bar", 0.0, (double)sd->page.y / (double)h); edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", 0.0, (double)sd->page.y / (double)h);
else else
edje_object_part_drag_page_set(sd->edje_obj, "vbar_bar", 0.0, -((double)sd->page.y * ((double)vh / (double)h)) / 100.0); edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", 0.0, -((double)sd->page.y * ((double)vh / (double)h)) / 100.0);
sd->pan_func.set(sd->pan_obj, x, y); sd->pan_func.set(sd->pan_obj, x, y);
} }
else else
{ {
edje_object_part_drag_size_set(sd->edje_obj, "vbar_bar", 1.0, 1.0); edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", 1.0, 1.0);
edje_object_part_drag_size_set(sd->edje_obj, "hbar_bar", 1.0, 1.0); edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", 1.0, 1.0);
sd->pan_func.set(sd->pan_obj, 0, 0); sd->pan_func.set(sd->pan_obj, 0, 0);
} }
_e_smart_scrollbar_bar_visibility_adjust(sd); _e_smart_scrollbar_bar_visibility_adjust(sd);
@ -672,8 +672,8 @@ _e_smart_add(Evas_Object *obj)
sd->edje_obj = o; sd->edje_obj = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/scrollframe"); "widgets/scrollframe");
edje_object_signal_callback_add(o, "drag*", "vbar_bar", _e_smart_edje_drag_v, sd); edje_object_signal_callback_add(o, "drag*", "e.dragable.vbar", _e_smart_edje_drag_v, sd);
edje_object_signal_callback_add(o, "drag*", "hbar_bar", _e_smart_edje_drag_h, sd); edje_object_signal_callback_add(o, "drag*", "e.dragable.hbar", _e_smart_edje_drag_h, sd);
evas_object_smart_member_add(o, obj); evas_object_smart_member_add(o, obj);
o = evas_object_rectangle_add(evas_object_evas_get(obj)); o = evas_object_rectangle_add(evas_object_evas_get(obj));

View File

@ -149,7 +149,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
es->id = id; es->id = id;
snprintf(buf, sizeof(buf), "%i", es->id); snprintf(buf, sizeof(buf), "%i", es->id);
es->gadcon = e_gadcon_swallowed_new(es->name, buf, es->o_base, "items"); es->gadcon = e_gadcon_swallowed_new(es->name, buf, es->o_base, "e.swallow.content");
e_gadcon_min_size_request_callback_set(es->gadcon, e_gadcon_min_size_request_callback_set(es->gadcon,
_e_shelf_gadcon_min_size_request, _e_shelf_gadcon_min_size_request,
es); es);
@ -160,7 +160,8 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
_e_shelf_gadcon_frame_request, _e_shelf_gadcon_frame_request,
es); es);
e_gadcon_orient(es->gadcon, E_GADCON_ORIENT_TOP); e_gadcon_orient(es->gadcon, E_GADCON_ORIENT_TOP);
edje_object_signal_emit(es->o_base, "set_orientation", "top"); snprintf(buf, sizeof(buf), "e,state,orientation,%s", _e_shelf_orient_string_get(es));
edje_object_signal_emit(es->o_base, buf, "e");
edje_object_message_signal_process(es->o_base); edje_object_message_signal_process(es->o_base);
e_gadcon_zone_set(es->gadcon, zone); e_gadcon_zone_set(es->gadcon, zone);
e_gadcon_ecore_evas_set(es->gadcon, es->ee); e_gadcon_ecore_evas_set(es->gadcon, es->ee);
@ -335,12 +336,13 @@ e_shelf_unsave(E_Shelf *es)
EAPI void EAPI void
e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient) e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient)
{ {
char buf[PATH_MAX];
E_OBJECT_CHECK(es); E_OBJECT_CHECK(es);
E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE); E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
e_gadcon_orient(es->gadcon, orient); e_gadcon_orient(es->gadcon, orient);
edje_object_signal_emit(es->o_base, "set_orientation", snprintf(buf, sizeof(buf), "e,state,orientation,%s", _e_shelf_orient_string_get(es));
_e_shelf_orient_string_get(es)); edje_object_signal_emit(es->o_base, buf, "e");
edje_object_message_signal_process(es->o_base); edje_object_message_signal_process(es->o_base);
} }
@ -773,8 +775,8 @@ _e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *styl
evas_object_del(o); evas_object_del(o);
return NULL; return NULL;
} }
edje_object_signal_emit(o, "set_orientation", snprintf(buf, sizeof(buf), "e,state,orientation,%s", _e_shelf_orient_string_get(es));
_e_shelf_orient_string_get(es)); edje_object_signal_emit(es->o_base, buf, "e");
edje_object_message_signal_process(o); edje_object_message_signal_process(o);
return o; return o;
} }
@ -934,7 +936,7 @@ _e_shelf_cb_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info)
es = data; es = data;
ev = event_info; ev = event_info;
edje_object_signal_emit(es->o_base, "active", ""); edje_object_signal_emit(es->o_base, "e,state,focused", "e");
} }
static void static void
@ -945,7 +947,7 @@ _e_shelf_cb_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_info
es = data; es = data;
ev = event_info; ev = event_info;
edje_object_signal_emit(es->o_base, "inactive", ""); edje_object_signal_emit(es->o_base, "e,state,unfocused", "e");
} }
static int static int

View File

@ -123,7 +123,7 @@ e_slider_value_step_size_set(Evas_Object *obj, double step_size)
step = 0.0; step = 0.0;
if (sd->val_max > sd->val_min) if (sd->val_max > sd->val_min)
step = step_size / (sd->val_max - sd->val_min); step = step_size / (sd->val_max - sd->val_min);
edje_object_part_drag_step_set(sd->edje_obj, "slider", step, step); edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.slider", step, step);
_e_smart_value_limit(sd); _e_smart_value_limit(sd);
_e_smart_value_update_now(sd); _e_smart_value_update_now(sd);
} }
@ -164,9 +164,9 @@ e_slider_value_format_display_set(Evas_Object *obj, const char *format)
if (changed) if (changed)
{ {
if (sd->format) if (sd->format)
edje_object_signal_emit(sd->edje_obj, "show_label", ""); edje_object_signal_emit(sd->edje_obj, "e,action,show,label", "e");
else else
edje_object_signal_emit(sd->edje_obj, "hide_label", ""); edje_object_signal_emit(sd->edje_obj, "e,action,hide,label", "e");
} }
_e_smart_format_update(sd); _e_smart_format_update(sd);
edje_object_message_signal_process(sd->edje_obj); edje_object_message_signal_process(sd->edje_obj);
@ -224,7 +224,7 @@ _e_smart_set_timer(void *data)
if (pos < 0.0) pos = 0.0; if (pos < 0.0) pos = 0.0;
else if (pos > 1.0) pos = 1.0; else if (pos > 1.0) pos = 1.0;
if (sd->reversed) pos = 1.0 - pos; if (sd->reversed) pos = 1.0 - pos;
edje_object_part_drag_value_set(sd->edje_obj, "slider", pos, pos); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", pos, pos);
sd->set_timer = NULL; sd->set_timer = NULL;
return 0; return 0;
} }
@ -248,7 +248,7 @@ _e_smart_value_fetch(E_Smart_Data *sd)
{ {
double posx = 0.0, posy = 0.0, pos = 0.0; double posx = 0.0, posy = 0.0, pos = 0.0;
edje_object_part_drag_value_get(sd->edje_obj, "slider", &posx, &posy); edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.slider", &posx, &posy);
if (sd->horizontal) pos = posx; if (sd->horizontal) pos = posx;
else pos = posy; else pos = posy;
sd->val = (pos * (sd->val_max - sd->val_min)) + sd->val_min; sd->val = (pos * (sd->val_max - sd->val_min)) + sd->val_min;
@ -316,7 +316,7 @@ _e_smart_format_update(E_Smart_Data *sd)
char buf[256]; char buf[256];
snprintf(buf, sizeof(buf), sd->format, sd->val); snprintf(buf, sizeof(buf), sd->format, sd->val);
edje_object_part_text_set(sd->edje_obj, "label", buf); edje_object_part_text_set(sd->edje_obj, "e.text.label", buf);
} }
} }
@ -384,10 +384,10 @@ _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
double s; double s;
s = (sd->val_max - sd->val_min) / sd->step_count; s = (sd->val_max - sd->val_min) / sd->step_count;
edje_object_part_drag_step(sd->edje_obj, "slider", -s, -s); edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", -s, -s);
} }
else else
edje_object_part_drag_step(sd->edje_obj, "slider", -sd->step_size, -sd->step_size); edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", -sd->step_size, -sd->step_size);
} }
else if ((!strcmp(ev->keyname, "Down")) || else if ((!strcmp(ev->keyname, "Down")) ||
(!strcmp(ev->keyname, "KP_Down")) || (!strcmp(ev->keyname, "KP_Down")) ||
@ -399,20 +399,20 @@ _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
double s; double s;
s = (sd->val_max - sd->val_min) / sd->step_count; s = (sd->val_max - sd->val_min) / sd->step_count;
edje_object_part_drag_step(sd->edje_obj, "slider", s, s); edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", s, s);
} }
else else
edje_object_part_drag_step(sd->edje_obj, "slider", sd->step_size, sd->step_size); edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", sd->step_size, sd->step_size);
} }
else if ((!strcmp(ev->keyname, "Home")) || else if ((!strcmp(ev->keyname, "Home")) ||
(!strcmp(ev->keyname, "KP_Home"))) (!strcmp(ev->keyname, "KP_Home")))
{ {
edje_object_part_drag_value_set(sd->edje_obj, "slider", 0., 0.); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", 0., 0.);
} }
else if ((!strcmp(ev->keyname, "End")) || else if ((!strcmp(ev->keyname, "End")) ||
(!strcmp(ev->keyname, "KP_End"))) (!strcmp(ev->keyname, "KP_End")))
{ {
edje_object_part_drag_value_set(sd->edje_obj, "slider", 1., 1.); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", 1., 1.);
} }
} }

View File

@ -48,7 +48,7 @@ e_theme_about_new(E_Container *con)
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
evas_object_show(o); evas_object_show(o);
edje_object_signal_callback_add(about->bg_object, "close", "", edje_object_signal_callback_add(about->bg_object, "e,action,close", "",
_e_theme_about_cb_close, about); _e_theme_about_cb_close, about);
e_win_centered_set(about->win, 1); e_win_centered_set(about->win, 1);
return about; return about;

View File

@ -110,13 +110,13 @@ e_tlist_selected_set(Evas_Object * obj, int n)
return; return;
si = evas_list_nth(sd->items, sd->selected); si = evas_list_nth(sd->items, sd->selected);
if (si) if (si)
edje_object_signal_emit(si->base_obj, "passive", ""); edje_object_signal_emit(si->base_obj, "e,state,unselected", "e");
sd->selected = n; sd->selected = n;
si = evas_list_nth(sd->items, sd->selected); si = evas_list_nth(sd->items, sd->selected);
if (si) if (si)
{ {
evas_object_raise(si->base_obj); evas_object_raise(si->base_obj);
edje_object_signal_emit(si->base_obj, "active", ""); edje_object_signal_emit(si->base_obj, "e,state,selected", "e");
if (si->func_hilight) if (si->func_hilight)
si->func_hilight(si->data, si->data2); si->func_hilight(si->data, si->data2);
if (!sd->selector) if (!sd->selector)
@ -150,9 +150,9 @@ e_tlist_selected_label_get(Evas_Object * obj)
if (si) if (si)
{ {
if (si->markup) if (si->markup)
return edje_object_part_text_get(si->base_obj, "labelblock"); return edje_object_part_text_get(si->base_obj, "e.textblock.label");
else else
return edje_object_part_text_get(si->base_obj, "label"); return edje_object_part_text_get(si->base_obj, "e.text.label");
} }
return NULL; return NULL;
} }
@ -270,9 +270,9 @@ e_tlist_remove_label(Evas_Object * obj, char *label)
if (si->markup) if (si->markup)
t = strdup(edje_object_part_text_get t = strdup(edje_object_part_text_get
(si->base_obj, "labelblock")); (si->base_obj, "e.textblock.label"));
else else
t = strdup(edje_object_part_text_get(si->base_obj, "label")); t = strdup(edje_object_part_text_get(si->base_obj, "e.text.label"));
if (!strcmp(t, label)) if (!strcmp(t, label))
{ {
evas_object_del(si->base_obj); evas_object_del(si->base_obj);
@ -334,9 +334,9 @@ _e_tlist_append(Evas_Object * obj, char *label,
e_theme_edje_object_set(si->base_obj, "base/theme/widgets", e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
"widgets/tlist"); "widgets/tlist");
if (si->markup) if (si->markup)
edje_object_part_text_set(si->base_obj, "labelblock", label); edje_object_part_text_set(si->base_obj, "e.textblock.label", label);
else else
edje_object_part_text_set(si->base_obj, "label", label); edje_object_part_text_set(si->base_obj, "e.text.label", label);
si->func = func; si->func = func;
si->func_hilight = func_hilight; si->func_hilight = func_hilight;
si->data = data; si->data = data;

View File

@ -45,8 +45,8 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
wd->o_button = o; wd->o_button = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/button"); "widgets/button");
edje_object_signal_callback_add(o, "click", "", _e_wid_signal_cb1, obj); edje_object_signal_callback_add(o, "e,action,click", "", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
@ -58,8 +58,8 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_icon = o; wd->o_icon = o;
e_util_edje_icon_set(o, icon); e_util_edje_icon_set(o, icon);
edje_object_part_swallow(wd->o_button, "icon_swallow", o); edje_object_part_swallow(wd->o_button, "e.swallow.icon", o);
edje_object_signal_emit(wd->o_button, "icon_visible", ""); edje_object_signal_emit(wd->o_button, "e,action,show,icon", "e");
edje_object_message_signal_process(wd->o_button); edje_object_message_signal_process(wd->o_button);
evas_object_show(o); evas_object_show(o);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
@ -77,7 +77,7 @@ e_widget_button_label_set(Evas_Object *obj, const char *label)
E_Widget_Data *wd; E_Widget_Data *wd;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
edje_object_part_text_set(wd->o_button, "label", label); edje_object_part_text_set(wd->o_button, "e.text.label", label);
} }
EAPI void EAPI void
@ -87,8 +87,8 @@ e_widget_button_icon_set(Evas_Object *obj, Evas_Object *icon)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
wd->o_icon = icon; wd->o_icon = icon;
edje_object_part_swallow(wd->o_button, "icon_swallow", icon); edje_object_part_swallow(wd->o_button, "e.swallow.icon", icon);
edje_object_signal_emit(wd->o_button, "icon_visible", ""); edje_object_signal_emit(wd->o_button, "e,action,show,icon", "e");
edje_object_message_signal_process(wd->o_button); edje_object_message_signal_process(wd->o_button);
evas_object_pass_events_set(icon, 1); evas_object_pass_events_set(icon, 1);
evas_object_show(icon); evas_object_show(icon);
@ -112,12 +112,12 @@ _e_wid_focus_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj)) if (e_widget_focus_get(obj))
{ {
edje_object_signal_emit(wd->o_button, "focus_in", ""); edje_object_signal_emit(wd->o_button, "e,state,focused", "e");
evas_object_focus_set(wd->o_button, 1); evas_object_focus_set(wd->o_button, 1);
} }
else else
{ {
edje_object_signal_emit(wd->o_button, "focus_out", ""); edje_object_signal_emit(wd->o_button, "e,state,unfocused", "e");
evas_object_focus_set(wd->o_button, 0); evas_object_focus_set(wd->o_button, 0);
} }
} }
@ -138,9 +138,9 @@ _e_wid_disable_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_disabled_get(obj)) if (e_widget_disabled_get(obj))
edje_object_signal_emit(wd->o_button, "disabled", ""); edje_object_signal_emit(wd->o_button, "e,state,disabled", "e");
else else
edje_object_signal_emit(wd->o_button, "enabled", ""); edje_object_signal_emit(wd->o_button, "e,state,enabled", "e");
} }
static void static void

View File

@ -43,14 +43,14 @@ e_widget_check_add(Evas *evas, char *label, int *val)
wd->o_check = o; wd->o_check = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/check"); "widgets/check");
edje_object_signal_callback_add(o, "toggled", "*", _e_wid_signal_cb1, obj); edje_object_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);
edje_object_size_min_calc(o, &mw, &mh); edje_object_size_min_calc(o, &mw, &mh);
e_widget_min_size_set(obj, mw, mh); e_widget_min_size_set(obj, mw, mh);
if (wd->valptr) if (wd->valptr)
{ {
if (*(wd->valptr)) edje_object_signal_emit(o, "toggle_on", ""); if (*(wd->valptr)) edje_object_signal_emit(o, "e,state,checked", "e");
} }
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
@ -69,9 +69,9 @@ e_widget_check_checked_set(Evas_Object *check, int checked)
if (wd->valptr) if (wd->valptr)
*(wd->valptr) = checked; *(wd->valptr) = checked;
if (checked) if (checked)
edje_object_signal_emit(wd->o_check, "toggle_on", ""); edje_object_signal_emit(wd->o_check, "e,state,checked", "e");
else else
edje_object_signal_emit(wd->o_check, "toggle_off", ""); edje_object_signal_emit(wd->o_check, "e,state,unchecked", "e");
} }
EAPI int EAPI int
@ -110,12 +110,12 @@ e_widget_check_icon_add(Evas *evas, char *label, char *icon, int icon_w, int ico
wd->o_check = o; wd->o_check = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/check_icon"); "widgets/check_icon");
edje_object_signal_callback_add(o, "toggled", "*", _e_wid_signal_cb1, obj); edje_object_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);
if (label) if (label)
{ {
edje_object_signal_emit(o, "label_visible", ""); edje_object_signal_emit(o, "e,state,labeled", "e");
edje_object_message_signal_process(o); edje_object_message_signal_process(o);
} }
if (icon) if (icon)
@ -124,7 +124,7 @@ e_widget_check_icon_add(Evas *evas, char *label, char *icon, int icon_w, int ico
wd->o_icon = o2; wd->o_icon = o2;
e_util_edje_icon_set(o2, icon); e_util_edje_icon_set(o2, icon);
edje_extern_object_min_size_set(o2, icon_w, icon_h); edje_extern_object_min_size_set(o2, icon_w, icon_h);
edje_object_part_swallow(wd->o_check, "icon_swallow", o2); edje_object_part_swallow(wd->o_check, "e.swallow.icon", o2);
evas_object_show(o2); evas_object_show(o2);
e_widget_sub_object_add(obj, o2); e_widget_sub_object_add(obj, o2);
} }
@ -133,7 +133,7 @@ e_widget_check_icon_add(Evas *evas, char *label, char *icon, int icon_w, int ico
e_widget_min_size_set(obj, mw, mh); e_widget_min_size_set(obj, mw, mh);
if (wd->valptr) if (wd->valptr)
{ {
if (*(wd->valptr)) edje_object_signal_emit(o, "toggle_on", ""); if (*(wd->valptr)) edje_object_signal_emit(o, "e,state,checked", "e");
} }
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
@ -160,12 +160,12 @@ _e_wid_focus_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj)) if (e_widget_focus_get(obj))
{ {
edje_object_signal_emit(wd->o_check, "focus_in", ""); edje_object_signal_emit(wd->o_check, "e,state,focused", "e");
evas_object_focus_set(wd->o_check, 1); evas_object_focus_set(wd->o_check, 1);
} }
else else
{ {
edje_object_signal_emit(wd->o_check, "focus_out", ""); edje_object_signal_emit(wd->o_check, "e,state,unfocused", "e");
evas_object_focus_set(wd->o_check, 0); evas_object_focus_set(wd->o_check, 0);
} }
} }
@ -183,12 +183,12 @@ _e_wid_do(Evas_Object *obj)
if (*(wd->valptr) == 0) if (*(wd->valptr) == 0)
{ {
*(wd->valptr) = 1; *(wd->valptr) = 1;
edje_object_signal_emit(wd->o_check, "toggle_on", ""); edje_object_signal_emit(wd->o_check, "e,state,checked", "e");
} }
else else
{ {
*(wd->valptr) = 0; *(wd->valptr) = 0;
edje_object_signal_emit(wd->o_check, "toggle_off", ""); edje_object_signal_emit(wd->o_check, "e,state,unchecked", "e");
} }
} }
evas_object_smart_callback_call(obj, "changed", NULL); evas_object_smart_callback_call(obj, "changed", NULL);
@ -210,9 +210,9 @@ _e_wid_disable_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_disabled_get(obj)) if (e_widget_disabled_get(obj))
edje_object_signal_emit(wd->o_check, "disabled", ""); edje_object_signal_emit(wd->o_check, "e,state,disabled", "e");
else else
edje_object_signal_emit(wd->o_check, "enabled", ""); edje_object_signal_emit(wd->o_check, "e,state,enabled", "e");
} }
static void static void

View File

@ -109,7 +109,7 @@ e_widget_color_well_add(Evas *evas, E_Color *color, int show_color_dialog)
e_widget_resize_object_set(obj, o); e_widget_resize_object_set(obj, o);
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/color_well"); "widgets/color_well");
edje_object_signal_callback_add(o, "click", "", _e_wid_signal_cb1, obj); edje_object_signal_callback_add(o, "e,action,click", "", _e_wid_signal_cb1, obj);
evas_object_show(o); evas_object_show(o);
wd->o_edje = o; wd->o_edje = o;
@ -119,7 +119,7 @@ e_widget_color_well_add(Evas *evas, E_Color *color, int show_color_dialog)
o = evas_object_rectangle_add(evas); o = evas_object_rectangle_add(evas);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
evas_object_color_set(o, color->r, color->g, color->b, color->a); evas_object_color_set(o, color->r, color->g, color->b, color->a);
edje_object_part_swallow(wd->o_edje, "content", o); edje_object_part_swallow(wd->o_edje, "e.swallow.content", o);
evas_object_show(o); evas_object_show(o);
wd->o_rect = o; wd->o_rect = o;

View File

@ -199,7 +199,7 @@ e_widget_csel_add(Evas *evas, E_Color *color)
e_widget_sub_object_add(obj, table); e_widget_sub_object_add(obj, table);
e_widget_resize_object_set(obj, table); e_widget_resize_object_set(obj, table);
frame = e_widget_frametable_add(evas, "colors", 0); frame = e_widget_table_add(evas, 0);
e_widget_sub_object_add(obj, frame); e_widget_sub_object_add(obj, frame);
grp = e_widget_radio_group_new(&wd->mode); grp = e_widget_radio_group_new(&wd->mode);
@ -233,20 +233,20 @@ e_widget_csel_add(Evas *evas, E_Color *color)
o = e_widget_radio_add(evas, labels[i], i, grp); o = e_widget_radio_add(evas, labels[i], i, grp);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
e_widget_on_change_hook_set(o, _e_wid_cb_radio_changed, wd); e_widget_on_change_hook_set(o, _e_wid_cb_radio_changed, wd);
e_widget_frametable_object_append(frame, o, 0, i, 1, 1, 1, 1, 0, 0); e_widget_table_object_append(frame, o, 0, i, 1, 1, 1, 1, 0, 0);
o = e_widget_cslider_add(evas, i, wd->cv, 0, 0); o = e_widget_cslider_add(evas, i, wd->cv, 0, 0);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
evas_object_show(o); evas_object_show(o);
wd->sliders = evas_list_append(wd->sliders, o); wd->sliders = evas_list_append(wd->sliders, o);
e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd); e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd);
e_widget_frametable_object_append(frame, o, 1, i, 1, 1, 1, 1, 1, 0); e_widget_table_object_append(frame, o, 1, i, 1, 1, 1, 1, 1, 0);
o = e_widget_entry_add(evas, &(wd->values[i])); o = e_widget_entry_add(evas, &(wd->values[i]));
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
evas_object_show(o); evas_object_show(o);
wd->entries = evas_list_append(wd->entries, o); wd->entries = evas_list_append(wd->entries, o);
e_widget_frametable_object_append(frame, o, 2, i, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(frame, o, 2, i, 1, 1, 1, 1, 1, 1);
e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd); e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd);
} }
@ -271,6 +271,7 @@ e_widget_csel_add(Evas *evas, E_Color *color)
o = e_widget_color_well_add(evas, wd->cv, 0); o = e_widget_color_well_add(evas, wd->cv, 0);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
evas_object_show(o); evas_object_show(o);
evas_object_resize(o, 20, 20);
wd->well = o; wd->well = o;
e_widget_table_object_append(table, o, 3, 2, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(table, o, 3, 2, 1, 1, 1, 1, 1, 1);

View File

@ -62,9 +62,9 @@ e_widget_cslider_add(Evas *evas, E_Color_Component mode, E_Color *color, int ver
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/cslider"); "widgets/cslider");
if (wd->vertical) if (wd->vertical)
edje_object_signal_emit(o, "e,direction,v", ""); edje_object_signal_emit(o, "e,state,direction,v", "e");
else else
edje_object_signal_emit(o, "e,direction,h", ""); edje_object_signal_emit(o, "e,state,direction,h", "e");
evas_object_show(o); evas_object_show(o);
edje_object_size_min_calc(o, &mw, &mh); edje_object_size_min_calc(o, &mw, &mh);
e_widget_min_size_set(obj, mw, mh); e_widget_min_size_set(obj, mw, mh);
@ -85,7 +85,7 @@ e_widget_cslider_add(Evas *evas, E_Color_Component mode, E_Color *color, int ver
evas_object_show(o); evas_object_show(o);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
wd->o_grad = o; wd->o_grad = o;
edje_object_part_swallow(wd->o_cslider, "content", o); edje_object_part_swallow(wd->o_cslider, "e.swallow.content", o);
evas_object_intercept_resize_callback_add(o, _e_wid_resize, wd); evas_object_intercept_resize_callback_add(o, _e_wid_resize, wd);
evas_object_intercept_move_callback_add(o, _e_wid_move, wd); evas_object_intercept_move_callback_add(o, _e_wid_move, wd);
_e_wid_update(wd); _e_wid_update(wd);
@ -258,7 +258,7 @@ _e_wid_update_standard(E_Widget_Data *wd)
break; break;
} }
edje_object_part_drag_value_set(wd->o_cslider, "cursor", vx, vx); edje_object_part_drag_value_set(wd->o_cslider, "e.dragable.cursor", vx, vx);
} }
void void
@ -323,7 +323,7 @@ _e_wid_update_fixed(E_Widget_Data *wd)
break; break;
} }
edje_object_part_drag_value_set(wd->o_cslider, "cursor", vx, vx); edje_object_part_drag_value_set(wd->o_cslider, "e.dragable.cursor", vx, vx);
} }
static void static void
@ -343,12 +343,12 @@ _e_wid_focus_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj)) if (e_widget_focus_get(obj))
{ {
edje_object_signal_emit(wd->o_cslider, "focus_in", ""); edje_object_signal_emit(wd->o_cslider, "e,state,focused", "e");
evas_object_focus_set(wd->o_cslider, 1); evas_object_focus_set(wd->o_cslider, 1);
} }
else else
{ {
edje_object_signal_emit(wd->o_cslider, "focus_out", ""); edje_object_signal_emit(wd->o_cslider, "e,state,unfocused", "e");
evas_object_focus_set(wd->o_cslider, 0); evas_object_focus_set(wd->o_cslider, 0);
} }
} }
@ -368,9 +368,9 @@ _e_wid_disable_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_disabled_get(obj)) if (e_widget_disabled_get(obj))
edje_object_signal_emit(wd->o_cslider, "disabled", ""); edje_object_signal_emit(wd->o_cslider, "e,state,disabled", "e");
else else
edje_object_signal_emit(wd->o_cslider, "enabled", ""); edje_object_signal_emit(wd->o_cslider, "e,state,enabled", "e");
} }
static void static void

View File

@ -33,7 +33,7 @@ e_widget_framelist_add(Evas *evas, char *label, int horiz)
wd->o_frame = o; wd->o_frame = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/frame"); "widgets/frame");
edje_object_part_text_set(o, "label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
e_widget_resize_object_set(obj, o); e_widget_resize_object_set(obj, o);
@ -42,7 +42,7 @@ e_widget_framelist_add(Evas *evas, char *label, int horiz)
wd->o_box = o; wd->o_box = o;
e_box_orientation_set(o, horiz); e_box_orientation_set(o, horiz);
e_box_homogenous_set(o, 0); e_box_homogenous_set(o, 0);
edje_object_part_swallow(wd->o_frame, "items", o); edje_object_part_swallow(wd->o_frame, "e.swallow.content", o);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
evas_object_show(o); evas_object_show(o);
@ -71,7 +71,7 @@ e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj)
); );
e_box_min_size_get(wd->o_box, &mw, &mh); e_box_min_size_get(wd->o_box, &mw, &mh);
edje_extern_object_min_size_set(wd->o_box, mw, mh); edje_extern_object_min_size_set(wd->o_box, mw, mh);
edje_object_part_swallow(wd->o_frame, "items", wd->o_box); edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_box);
edje_object_size_min_calc(wd->o_frame, &mw, &mh); edje_object_size_min_calc(wd->o_frame, &mw, &mh);
e_widget_min_size_set(obj, mw, mh); e_widget_min_size_set(obj, mw, mh);
e_widget_sub_object_add(obj, sobj); e_widget_sub_object_add(obj, sobj);
@ -104,7 +104,7 @@ _e_wid_disable_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_disabled_get(obj)) if (e_widget_disabled_get(obj))
edje_object_signal_emit(wd->o_frame, "disabled", ""); edje_object_signal_emit(wd->o_frame, "e,state,disabled", "e");
else else
edje_object_signal_emit(wd->o_frame, "enabled", ""); edje_object_signal_emit(wd->o_frame, "e,state,enabled", "e");
} }

View File

@ -33,7 +33,7 @@ e_widget_frametable_add(Evas *evas, char *label, int homogenous)
wd->o_frame = o; wd->o_frame = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/frame"); "widgets/frame");
edje_object_part_text_set(o, "label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
e_widget_resize_object_set(obj, o); e_widget_resize_object_set(obj, o);
@ -41,7 +41,7 @@ e_widget_frametable_add(Evas *evas, char *label, int homogenous)
o = e_table_add(evas); o = e_table_add(evas);
wd->o_table = o; wd->o_table = o;
e_table_homogenous_set(o, homogenous); e_table_homogenous_set(o, homogenous);
edje_object_part_swallow(wd->o_frame, "items", o); edje_object_part_swallow(wd->o_frame, "e.swallow.content", o);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
evas_object_show(o); evas_object_show(o);
@ -70,7 +70,7 @@ e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col,
); );
e_table_min_size_get(wd->o_table, &mw, &mh); e_table_min_size_get(wd->o_table, &mw, &mh);
edje_extern_object_min_size_set(wd->o_table, mw, mh); edje_extern_object_min_size_set(wd->o_table, mw, mh);
edje_object_part_swallow(wd->o_frame, "items", wd->o_table); edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_table);
edje_object_size_min_calc(wd->o_frame, &mw, &mh); edje_object_size_min_calc(wd->o_frame, &mw, &mh);
e_widget_min_size_set(obj, mw, mh); e_widget_min_size_set(obj, mw, mh);
e_widget_sub_object_add(obj, sobj); e_widget_sub_object_add(obj, sobj);
@ -93,7 +93,7 @@ _e_wid_disable_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_disabled_get(obj)) if (e_widget_disabled_get(obj))
edje_object_signal_emit(wd->o_frame, "disabled", ""); edje_object_signal_emit(wd->o_frame, "e,state,disabled", "e");
else else
edje_object_signal_emit(wd->o_frame, "enabled", ""); edje_object_signal_emit(wd->o_frame, "e,state,enabled", "e");
} }

View File

@ -280,12 +280,12 @@ _e_wid_focus_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj)) if (e_widget_focus_get(obj))
{ {
edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "focus_in", ""); edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "e,state,focused", "e");
evas_object_focus_set(wd->o_ilist, 1); evas_object_focus_set(wd->o_ilist, 1);
} }
else else
{ {
edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "focus_out", ""); edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "focus_out", "e");
evas_object_focus_set(wd->o_ilist, 0); evas_object_focus_set(wd->o_ilist, 0);
} }
} }

View File

@ -29,7 +29,7 @@ e_widget_label_add(Evas *evas, const char *label)
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/label"); "widgets/label");
wd->text = o; wd->text = o;
edje_object_part_text_set(o, "label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);
edje_object_size_min_calc(o, &mw, &mh); edje_object_size_min_calc(o, &mw, &mh);
e_widget_can_focus_set(obj, 0); e_widget_can_focus_set(obj, 0);
@ -47,7 +47,7 @@ e_widget_label_text_set(Evas_Object *obj, const char *text)
Evas_Coord mw, mh; Evas_Coord mw, mh;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
edje_object_part_text_set(wd->text, "label", text); edje_object_part_text_set(wd->text, "e.text.label", text);
edje_object_size_min_calc(wd->text, &mw, &mh); edje_object_size_min_calc(wd->text, &mw, &mh);
edje_extern_object_min_size_set(wd->text, mw, mh); edje_extern_object_min_size_set(wd->text, mw, mh);
return; return;

View File

@ -39,7 +39,7 @@ e_widget_preview_add(Evas *evas, int minw, int minh)
edje_extern_object_min_size_set(o, minw, minh); edje_extern_object_min_size_set(o, minw, minh);
edje_extern_object_max_size_set(o, minw, minh); edje_extern_object_max_size_set(o, minw, minh);
evas_object_show(o); evas_object_show(o);
edje_object_part_swallow(wd->o_frame, "item", o); edje_object_part_swallow(wd->o_frame, "e.swallow.content", o);
e_widget_data_set(obj, wd); e_widget_data_set(obj, wd);
e_widget_can_focus_set(obj, 0); e_widget_can_focus_set(obj, 0);
@ -83,7 +83,7 @@ e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key,
e_thumb_icon_begin(wd->img); e_thumb_icon_begin(wd->img);
evas_object_smart_callback_add(wd->img, "e_thumb_gen", _e_wid_preview_thumb_gen, wd); evas_object_smart_callback_add(wd->img, "e_thumb_gen", _e_wid_preview_thumb_gen, wd);
edje_object_part_swallow(wd->o_frame, "item", wd->img); edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img);
evas_object_show(wd->img); evas_object_show(wd->img);
return 1; return 1;
} }

View File

@ -60,14 +60,14 @@ e_widget_radio_add(Evas *evas, char *label, int valnum, E_Radio_Group *group)
wd->o_radio = o; wd->o_radio = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/radio"); "widgets/radio");
edje_object_signal_callback_add(o, "toggled", "*", _e_wid_signal_cb1, obj); edje_object_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);
edje_object_size_min_calc(o, &mw, &mh); edje_object_size_min_calc(o, &mw, &mh);
e_widget_min_size_set(obj, mw, mh); e_widget_min_size_set(obj, mw, mh);
if ((wd->group) && (wd->group->valptr)) if ((wd->group) && (wd->group->valptr))
{ {
if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "toggle_on", ""); if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "e,state,on", "e");
} }
if (wd->group) if (wd->group)
{ {
@ -103,13 +103,13 @@ e_widget_radio_icon_add(Evas *evas, char *label, char *icon, int icon_w, int ico
wd->o_radio = o; wd->o_radio = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/radio_icon"); "widgets/radio_icon");
edje_object_signal_callback_add(o, "toggled", "*", _e_wid_signal_cb1, obj); edje_object_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);
if (label) if (label)
{ {
edje_object_signal_emit(o, "label_visible", ""); edje_object_signal_emit(o, "e,state,labeled", "e");
edje_object_message_signal_process(o); edje_object_message_signal_process(o);
} }
@ -119,7 +119,7 @@ e_widget_radio_icon_add(Evas *evas, char *label, char *icon, int icon_w, int ico
wd->o_icon = o2; wd->o_icon = o2;
e_util_edje_icon_set(o2, icon); e_util_edje_icon_set(o2, icon);
edje_extern_object_min_size_set(o2, icon_w, icon_h); edje_extern_object_min_size_set(o2, icon_w, icon_h);
edje_object_part_swallow(wd->o_radio, "icon_swallow", o2); edje_object_part_swallow(wd->o_radio, "e.swallow.icon", o2);
evas_object_show(o2); evas_object_show(o2);
e_widget_sub_object_add(obj, o2); e_widget_sub_object_add(obj, o2);
} }
@ -128,7 +128,7 @@ e_widget_radio_icon_add(Evas *evas, char *label, char *icon, int icon_w, int ico
e_widget_min_size_set(obj, mw, mh); e_widget_min_size_set(obj, mw, mh);
if ((wd->group) && (wd->group->valptr)) if ((wd->group) && (wd->group->valptr))
{ {
if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "toggle_on", ""); if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "e,state,on", "e");
} }
if (wd->group) if (wd->group)
{ {
@ -163,7 +163,7 @@ e_widget_radio_toggle_set(Evas_Object *obj, int toggle)
wd = e_widget_data_get(l->data); wd = e_widget_data_get(l->data);
if (wd->valnum == *(wd->group->valptr)) if (wd->valnum == *(wd->group->valptr))
{ {
edje_object_signal_emit(wd->o_radio, "toggle_off", ""); edje_object_signal_emit(wd->o_radio, "e,state,off", "e");
//toggled = 1; //toggled = 1;
break; break;
} }
@ -172,10 +172,10 @@ e_widget_radio_toggle_set(Evas_Object *obj, int toggle)
//if (!toggled) return; //if (!toggled) return;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
*(wd->group->valptr) = wd->valnum; *(wd->group->valptr) = wd->valnum;
edje_object_signal_emit(wd->o_radio, "toggle_on", ""); edje_object_signal_emit(wd->o_radio, "e,state,on", "e");
} }
else else
edje_object_signal_emit(wd->o_radio, "toggle_off", ""); edje_object_signal_emit(wd->o_radio, "e,state,off", "e");
} }
static void static void
@ -200,12 +200,12 @@ _e_wid_focus_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj)) if (e_widget_focus_get(obj))
{ {
edje_object_signal_emit(wd->o_radio, "focus_in", ""); edje_object_signal_emit(wd->o_radio, "e,state,focused", "e");
evas_object_focus_set(wd->o_radio, 1); evas_object_focus_set(wd->o_radio, 1);
} }
else else
{ {
edje_object_signal_emit(wd->o_radio, "focus_out", ""); edje_object_signal_emit(wd->o_radio, "e,state,unfocused", "e");
evas_object_focus_set(wd->o_radio, 0); evas_object_focus_set(wd->o_radio, 0);
} }
} }
@ -231,7 +231,7 @@ _e_wid_do(Evas_Object *obj)
wd = e_widget_data_get(l->data); wd = e_widget_data_get(l->data);
if (wd->valnum == *(wd->group->valptr)) if (wd->valnum == *(wd->group->valptr))
{ {
edje_object_signal_emit(wd->o_radio, "toggle_off", ""); edje_object_signal_emit(wd->o_radio, "e,state,off", "e");
toggled = 1; toggled = 1;
break; break;
} }
@ -240,7 +240,7 @@ _e_wid_do(Evas_Object *obj)
if (!toggled) return; if (!toggled) return;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
*(wd->group->valptr) = wd->valnum; *(wd->group->valptr) = wd->valnum;
edje_object_signal_emit(wd->o_radio, "toggle_on", ""); edje_object_signal_emit(wd->o_radio, "e,state,on", "e");
} }
evas_object_smart_callback_call(obj, "changed", NULL); evas_object_smart_callback_call(obj, "changed", NULL);
} }
@ -261,9 +261,9 @@ _e_wid_disable_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_disabled_get(obj)) if (e_widget_disabled_get(obj))
edje_object_signal_emit(wd->o_radio, "disabled", ""); edje_object_signal_emit(wd->o_radio, "e,state,disabled", "e");
else else
edje_object_signal_emit(wd->o_radio, "enabled", ""); edje_object_signal_emit(wd->o_radio, "e,state,enabled", "e");
} }
static void static void

View File

@ -119,12 +119,12 @@ _e_wid_focus_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj)) if (e_widget_focus_get(obj))
{ {
edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "focus_in", ""); edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "e,state,focused", "e");
evas_object_focus_set(wd->o_scrollframe, 1); evas_object_focus_set(wd->o_scrollframe, 1);
} }
else else
{ {
edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "focus_out", ""); edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "e,state,unfocused", "e");
evas_object_focus_set(wd->o_scrollframe, 0); evas_object_focus_set(wd->o_scrollframe, 0);
} }
} }

View File

@ -165,12 +165,12 @@ _e_wid_focus_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj)) if (e_widget_focus_get(obj))
{ {
edje_object_signal_emit(e_slider_edje_object_get(wd->o_slider), "focus_in", ""); edje_object_signal_emit(e_slider_edje_object_get(wd->o_slider), "e,state,focused", "e");
evas_object_focus_set(wd->o_slider, 1); evas_object_focus_set(wd->o_slider, 1);
} }
else else
{ {
edje_object_signal_emit(e_slider_edje_object_get(wd->o_slider), "focus_out", ""); edje_object_signal_emit(e_slider_edje_object_get(wd->o_slider), "e,state,unfocused", "e");
evas_object_focus_set(wd->o_slider, 0); evas_object_focus_set(wd->o_slider, 0);
} }
} }
@ -200,8 +200,8 @@ _e_wid_disable_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_disabled_get(obj)) if (e_widget_disabled_get(obj))
edje_object_signal_emit(e_slider_edje_object_get(wd->o_slider), edje_object_signal_emit(e_slider_edje_object_get(wd->o_slider),
"disabled", ""); "e,state,disabled", "");
else else
edje_object_signal_emit(e_slider_edje_object_get(wd->o_slider), edje_object_signal_emit(e_slider_edje_object_get(wd->o_slider),
"enabled", ""); "e,state,enabled", "");
} }

View File

@ -179,12 +179,12 @@ _e_wid_focus_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj)) if (e_widget_focus_get(obj))
{ {
edje_object_signal_emit(wd->o_edje, "focus_in", ""); edje_object_signal_emit(wd->o_edje, "e,state,focused", "e");
evas_object_focus_set(wd->o_edje, 1); evas_object_focus_set(wd->o_edje, 1);
} }
else else
{ {
edje_object_signal_emit(wd->o_edje, "focus_out", ""); edje_object_signal_emit(wd->o_edje, "e,state,unfocused", "e");
evas_object_focus_set(wd->o_edje, 0); evas_object_focus_set(wd->o_edje, 0);
} }
} }
@ -205,9 +205,9 @@ _e_wid_disable_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_disabled_get(obj)) if (e_widget_disabled_get(obj))
edje_object_signal_emit(wd->o_spectrum, "disabled", ""); edje_object_signal_emit(wd->o_spectrum, "e,state,disabled", "e");
else else
edje_object_signal_emit(wd->o_spectrum, "enabled", ""); edje_object_signal_emit(wd->o_spectrum, "e,state,enabled", "e");
} }
static void static void
@ -233,7 +233,7 @@ _e_wid_mouse_handle(Evas_Object *obj, int mx, int my)
if (vy > 1) vy = 1; if (vy > 1) vy = 1;
if (vy < 0) vy = 0; if (vy < 0) vy = 0;
edje_object_part_drag_value_set(wd->o_edje, "cursor", vx, vy); edje_object_part_drag_value_set(wd->o_edje, "e.dragable.cursor", vx, vy);
switch(wd->mode) switch(wd->mode)
{ {

View File

@ -56,7 +56,7 @@ e_widget_textblock_markup_set(Evas_Object *obj, const char *text)
Evas_Coord mw, mh, vw, vh; Evas_Coord mw, mh, vw, vh;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
edje_object_part_text_set(wd->o_textblock, "text", text); edje_object_part_text_set(wd->o_textblock, "e.textblock.text", text);
edje_object_size_min_calc(wd->o_textblock, &mw, &mh); edje_object_size_min_calc(wd->o_textblock, &mw, &mh);
e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh); e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
if (vw > mw) mw = vw; if (vw > mw) mw = vw;
@ -147,12 +147,12 @@ _e_wid_focus_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj)) if (e_widget_focus_get(obj))
{ {
edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "focus_in", ""); edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "e,state,focused", "e");
evas_object_focus_set(wd->o_scrollframe, 1); evas_object_focus_set(wd->o_scrollframe, 1);
} }
else else
{ {
edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "focus_out", ""); edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe), "e,state,unfocused", "e");
evas_object_focus_set(wd->o_scrollframe, 0); evas_object_focus_set(wd->o_scrollframe, 0);
} }
} }

View File

@ -126,8 +126,8 @@ e_winlist_show(E_Zone *zone)
e_box_align_set(o, 0.5, 0.0); e_box_align_set(o, 0.5, 0.0);
e_box_orientation_set(o, 0); e_box_orientation_set(o, 0);
e_box_homogenous_set(o, 1); e_box_homogenous_set(o, 1);
edje_object_part_swallow(bg_object, "list_swallow", o); edje_object_part_swallow(bg_object, "e.swallow.list", o);
edje_object_part_text_set(bg_object, "title", _("Select a window")); edje_object_part_text_set(bg_object, "e.text.title", _("Select a window"));
evas_object_show(o); evas_object_show(o);
desk = e_desk_current_get(winlist->zone); desk = e_desk_current_get(winlist->zone);
@ -356,10 +356,10 @@ _e_winlist_size_adjust(void)
e_box_freeze(list_object); e_box_freeze(list_object);
e_box_min_size_get(list_object, &mw, &mh); e_box_min_size_get(list_object, &mw, &mh);
edje_extern_object_min_size_set(list_object, mw, mh); edje_extern_object_min_size_set(list_object, mw, mh);
edje_object_part_swallow(bg_object, "list_swallow", list_object); edje_object_part_swallow(bg_object, "e.swallow.list", list_object);
edje_object_size_min_calc(bg_object, &mw, &mh); edje_object_size_min_calc(bg_object, &mw, &mh);
edje_extern_object_min_size_set(list_object, -1, -1); edje_extern_object_min_size_set(list_object, -1, -1);
edje_object_part_swallow(bg_object, "list_swallow", list_object); edje_object_part_swallow(bg_object, "e.swallow.list", list_object);
e_box_thaw(list_object); e_box_thaw(list_object);
zone = winlist->zone; zone = winlist->zone;
@ -429,28 +429,28 @@ _e_winlist_border_add(E_Border *bd, E_Zone *zone, E_Desk *desk)
ww->bg_object = o; ww->bg_object = o;
e_theme_edje_object_set(o, "base/theme/winlist", e_theme_edje_object_set(o, "base/theme/winlist",
"widgets/winlist/item"); "widgets/winlist/item");
edje_object_part_text_set(o, "title_text", e_border_name_get(ww->border)); edje_object_part_text_set(o, "e.text.label", e_border_name_get(ww->border));
evas_object_show(o); evas_object_show(o);
if (edje_object_part_exists(ww->bg_object, "icon_swallow")) if (edje_object_part_exists(ww->bg_object, "e.swallow.icon"))
{ {
o = e_border_icon_add(bd, winlist->evas); o = e_border_icon_add(bd, winlist->evas);
ww->icon_object = o; ww->icon_object = o;
edje_object_part_swallow(ww->bg_object, "icon_swallow", o); edje_object_part_swallow(ww->bg_object, "e.swallow.icon", o);
evas_object_show(o); evas_object_show(o);
} }
if (bd->shaded) if (bd->shaded)
{ {
edje_object_signal_emit(ww->bg_object, "shaded", ""); edje_object_signal_emit(ww->bg_object, "e,state,shaded", "e");
} }
else if (bd->iconic) else if (bd->iconic)
{ {
edje_object_signal_emit(ww->bg_object, "iconified", ""); edje_object_signal_emit(ww->bg_object, "e,state,iconified", "e");
} }
else if (bd->desk != desk) else if (bd->desk != desk)
{ {
if (!((bd->sticky) && (bd->zone == zone))) if (!((bd->sticky) && (bd->zone == zone)))
{ {
edje_object_signal_emit(ww->bg_object, "invisible", ""); edje_object_signal_emit(ww->bg_object, "e,state,invisible", "e");
} }
} }
@ -521,8 +521,8 @@ _e_winlist_activate(void)
if (!win_selected) return; if (!win_selected) return;
ww = win_selected->data; ww = win_selected->data;
edje_object_signal_emit(ww->bg_object, "active", ""); edje_object_signal_emit(ww->bg_object, "e,state,selected", "e");
if (ww->icon_object) edje_object_signal_emit(ww->icon_object, "active", ""); if (ww->icon_object) edje_object_signal_emit(ww->icon_object, "e,state,selected", "e");
ok = 0; ok = 0;
if ((ww->border->iconic) && if ((ww->border->iconic) &&
@ -603,21 +603,21 @@ _e_winlist_activate(void)
if ((!ww->border->lock_focus_out) && (e_config->winlist_list_focus_while_selecting)) if ((!ww->border->lock_focus_out) && (e_config->winlist_list_focus_while_selecting))
e_border_focus_set(ww->border, 1, 1); e_border_focus_set(ww->border, 1, 1);
} }
edje_object_part_text_set(bg_object, "title_text", e_border_name_get(ww->border)); edje_object_part_text_set(bg_object, "e.text.label", e_border_name_get(ww->border));
if (icon_object) if (icon_object)
{ {
evas_object_del(icon_object); evas_object_del(icon_object);
icon_object = NULL; icon_object = NULL;
} }
if (edje_object_part_exists(bg_object, "icon_swallow")) if (edje_object_part_exists(bg_object, "e.swallow.icon"))
{ {
o = e_border_icon_add(ww->border, winlist->evas); o = e_border_icon_add(ww->border, winlist->evas);
icon_object = o; icon_object = o;
edje_object_part_swallow(bg_object, "icon_swallow", o); edje_object_part_swallow(bg_object, "e.swallow.icon", o);
evas_object_show(o); evas_object_show(o);
} }
edje_object_signal_emit(bg_object, "active", ""); edje_object_signal_emit(bg_object, "e,state,selected", "e");
} }
static void static void
@ -644,9 +644,9 @@ _e_winlist_deactivate(void)
evas_object_del(icon_object); evas_object_del(icon_object);
icon_object = NULL; icon_object = NULL;
} }
edje_object_part_text_set(bg_object, "title_text", ""); edje_object_part_text_set(bg_object, "e.text.label", "");
edje_object_signal_emit(ww->bg_object, "passive", ""); edje_object_signal_emit(ww->bg_object, "e,state,unselected", "e");
if (ww->icon_object) edje_object_signal_emit(ww->icon_object, "passive", ""); if (ww->icon_object) edje_object_signal_emit(ww->icon_object, "e,state,unselected", "e");
if (!ww->border->lock_focus_in) if (!ww->border->lock_focus_in)
e_border_focus_set(ww->border, 0, 0); e_border_focus_set(ww->border, 0, 0);
} }

View File

@ -275,17 +275,17 @@ _battery_cb_check(void *data)
if (ret->state == BATTERY_STATE_CHARGING) if (ret->state == BATTERY_STATE_CHARGING)
{ {
if (battery_config->battery_prev_ac != 1) if (battery_config->battery_prev_ac != 1)
edje_object_signal_emit(inst->o_battery, "charge", ""); edje_object_signal_emit(inst->o_battery, "e,state,charging", "e");
edje_object_signal_emit(inst->o_battery, "pulsestop", ""); edje_object_signal_emit(inst->o_battery, "e,action,pulse,stop", "e");
edje_object_part_text_set(inst->o_battery, "reading", ret->reading); edje_object_part_text_set(inst->o_battery, "e.text.reading", ret->reading);
edje_object_part_text_set(inst->o_battery, "time", ret->time); edje_object_part_text_set(inst->o_battery, "e.text.time", ret->time);
_battery_face_level_set(inst, ret->level); _battery_face_level_set(inst, ret->level);
battery_config->battery_prev_ac = 1; battery_config->battery_prev_ac = 1;
} }
else if (ret->state == BATTERY_STATE_DISCHARGING) else if (ret->state == BATTERY_STATE_DISCHARGING)
{ {
if (battery_config->battery_prev_ac != 0) if (battery_config->battery_prev_ac != 0)
edje_object_signal_emit(inst->o_battery, "discharge", ""); edje_object_signal_emit(inst->o_battery, "e,state,discharging", "e");
if (ret->alarm) if (ret->alarm)
{ {
if (!battery_config->alarm_triggered) if (!battery_config->alarm_triggered)
@ -304,10 +304,10 @@ _battery_cb_check(void *data)
e_win_centered_set(dia->win, 1); e_win_centered_set(dia->win, 1);
e_dialog_show(dia); e_dialog_show(dia);
} }
edje_object_signal_emit(inst->o_battery, "pulse", ""); edje_object_signal_emit(inst->o_battery, "e,action,pulse,start", "e");
} }
edje_object_part_text_set(inst->o_battery, "reading", ret->reading); edje_object_part_text_set(inst->o_battery, "e.text.reading", ret->reading);
edje_object_part_text_set(inst->o_battery, "time", ret->time); edje_object_part_text_set(inst->o_battery, "e.text.time", ret->time);
_battery_face_level_set(inst, ret->level); _battery_face_level_set(inst, ret->level);
battery_config->battery_prev_ac = 0; battery_config->battery_prev_ac = 0;
if (ret->alarm) if (ret->alarm)
@ -317,11 +317,11 @@ _battery_cb_check(void *data)
{ {
/* ret->state == BATTERY_STATE_NONE */ /* ret->state == BATTERY_STATE_NONE */
if (battery_config->battery_prev_ac != 1) if (battery_config->battery_prev_ac != 1)
edje_object_signal_emit(inst->o_battery, "charge", ""); edje_object_signal_emit(inst->o_battery, "e,state,charging", "e");
if (battery_config->battery_prev_battery == 0) if (battery_config->battery_prev_battery == 0)
edje_object_signal_emit(inst->o_battery, "charge", ""); edje_object_signal_emit(inst->o_battery, "e,state,charging", "e");
edje_object_part_text_set(inst->o_battery, "reading", ret->reading); edje_object_part_text_set(inst->o_battery, "e.text.reading", ret->reading);
edje_object_part_text_set(inst->o_battery, "time", ret->time); edje_object_part_text_set(inst->o_battery, "e.text.time", ret->time);
_battery_face_level_set(inst, ret->level); _battery_face_level_set(inst, ret->level);
battery_config->battery_prev_ac = 1; battery_config->battery_prev_ac = 1;
battery_config->battery_prev_battery = 1; battery_config->battery_prev_battery = 1;
@ -331,9 +331,9 @@ _battery_cb_check(void *data)
{ {
/* Hasn't battery */ /* Hasn't battery */
if (battery_config->battery_prev_battery != 0) if (battery_config->battery_prev_battery != 0)
edje_object_signal_emit(inst->o_battery, "unknown", ""); edje_object_signal_emit(inst->o_battery, "e,state,unknown", "e");
edje_object_part_text_set(inst->o_battery, "reading", ret->reading); edje_object_part_text_set(inst->o_battery, "e.text.reading", ret->reading);
edje_object_part_text_set(inst->o_battery, "time", ret->time); edje_object_part_text_set(inst->o_battery, "e.text.time", ret->time);
_battery_face_level_set(inst, ret->level); _battery_face_level_set(inst, ret->level);
battery_config->battery_prev_battery = 0; battery_config->battery_prev_battery = 0;
} }
@ -342,9 +342,9 @@ _battery_cb_check(void *data)
{ {
/* Error reading status */ /* Error reading status */
if (battery_config->battery_prev_battery != -2) if (battery_config->battery_prev_battery != -2)
edje_object_signal_emit(inst->o_battery, "unknown", ""); edje_object_signal_emit(inst->o_battery, "e,state,unknown", "e");
edje_object_part_text_set(inst->o_battery, "reading", _("NO INFO")); edje_object_part_text_set(inst->o_battery, "e.text.reading", _("NO INFO"));
edje_object_part_text_set(inst->o_battery, "time", "--:--"); edje_object_part_text_set(inst->o_battery, "e.text.time", "--:--");
_battery_face_level_set(inst, (double)(rand() & 0xff) / 255.0); _battery_face_level_set(inst, (double)(rand() & 0xff) / 255.0);
battery_config->battery_prev_battery = -2; battery_config->battery_prev_battery = -2;
battery_config->battery_check_mode = CHECK_NONE; battery_config->battery_check_mode = CHECK_NONE;

View File

@ -82,9 +82,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
o = edje_object_add(gc->evas); o = edje_object_add(gc->evas);
e_theme_edje_object_set(o, "base/theme/modules/cpufreq", e_theme_edje_object_set(o, "base/theme/modules/cpufreq",
"modules/cpufreq/main"); "modules/cpufreq/main");
edje_object_signal_callback_add(o, "next_governor", "governor", _cpufreq_face_cb_set_governor, NULL); edje_object_signal_callback_add(o, "e,action,governor,next", "*", _cpufreq_face_cb_set_governor, NULL);
edje_object_signal_callback_add(o, "increase_frequency", "frequency", _cpufreq_face_cb_set_frequency, NULL); edje_object_signal_callback_add(o, "e,action,frequency,increase", "*", _cpufreq_face_cb_set_frequency, NULL);
edje_object_signal_callback_add(o, "decrease_frequency", "frequency", _cpufreq_face_cb_set_frequency, NULL); edje_object_signal_callback_add(o, "e,action,frequency,decrease", "*", _cpufreq_face_cb_set_frequency, NULL);
gcc = e_gadcon_client_new(gc, name, id, style, o); gcc = e_gadcon_client_new(gc, name, id, style, o);
gcc->data = inst; gcc->data = inst;
@ -404,9 +404,9 @@ _cpufreq_cb_check(void *data)
{ {
inst = l->data; inst = l->data;
if (cpufreq_config->status->active == 0) if (cpufreq_config->status->active == 0)
edje_object_signal_emit(inst->o_cpu, "passive", ""); edje_object_signal_emit(inst->o_cpu, "e,state,disabled", "e");
else if (cpufreq_config->status->active == 1) else if (cpufreq_config->status->active == 1)
edje_object_signal_emit(inst->o_cpu, "active", ""); edje_object_signal_emit(inst->o_cpu, "e,state,enabled", "e");
} }
} }

View File

@ -506,16 +506,16 @@ _ibar_config_update(void)
switch (ci->eap_label) switch (ci->eap_label)
{ {
case 0: case 0:
edje_object_part_text_set(ic->o_holder, "label", ic->app->name); edje_object_part_text_set(ic->o_holder, "e.text.label", ic->app->name);
edje_object_part_text_set(ic->o_holder2, "label", ic->app->name); edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->name);
break; break;
case 1: case 1:
edje_object_part_text_set(ic->o_holder, "label", ic->app->comment); edje_object_part_text_set(ic->o_holder, "e.text.label", ic->app->comment);
edje_object_part_text_set(ic->o_holder2, "label", ic->app->comment); edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->comment);
break; break;
case 2: case 2:
edje_object_part_text_set(ic->o_holder, "label", ic->app->generic); edje_object_part_text_set(ic->o_holder, "e.text.label", ic->app->generic);
edje_object_part_text_set(ic->o_holder2, "label", ic->app->generic); edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->generic);
break; break;
} }
} }
@ -619,16 +619,16 @@ _ibar_icon_fill(IBar_Icon *ic)
switch (ic->ibar->eap_label) switch (ic->ibar->eap_label)
{ {
case 0: /* Eap Name */ case 0: /* Eap Name */
edje_object_part_text_set(ic->o_holder, "label", ic->app->name); edje_object_part_text_set(ic->o_holder, "e.text.label", ic->app->name);
edje_object_part_text_set(ic->o_holder2, "label", ic->app->name); edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->name);
break; break;
case 1: /* Eap Comment */ case 1: /* Eap Comment */
edje_object_part_text_set(ic->o_holder, "label", ic->app->comment); edje_object_part_text_set(ic->o_holder, "e.text.label", ic->app->comment);
edje_object_part_text_set(ic->o_holder2, "label", ic->app->comment); edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->comment);
break; break;
case 2: /* Eap Generic */ case 2: /* Eap Generic */
edje_object_part_text_set(ic->o_holder, "label", ic->app->generic); edje_object_part_text_set(ic->o_holder, "e.text.label", ic->app->generic);
edje_object_part_text_set(ic->o_holder2, "label", ic->app->generic); edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->generic);
break; break;
} }
} }
@ -754,9 +754,9 @@ _ibar_cb_app_change(void *data, E_App *a, E_App_Change ch)
if (ic) if (ic)
{ {
if (a->startup_notify) if (a->startup_notify)
_ibar_icon_signal_emit(ic, "start", ""); _ibar_icon_signal_emit(ic, "e,action,start", "e");
else else
_ibar_icon_signal_emit(ic, "exec", ""); _ibar_icon_signal_emit(ic, "e,action,exec", "e");
} }
} }
break; break;
@ -768,7 +768,7 @@ _ibar_cb_app_change(void *data, E_App *a, E_App_Change ch)
IBar_Icon *ic; IBar_Icon *ic;
ic = _ibar_icon_find(b, a); ic = _ibar_icon_find(b, a);
if (ic) _ibar_icon_signal_emit(ic, "stop", ""); if (ic) _ibar_icon_signal_emit(ic, "e,action,stop", "e");
} }
break; break;
default: default:
@ -850,9 +850,9 @@ _ibar_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
ev = event_info; ev = event_info;
ic = data; ic = data;
_ibar_icon_signal_emit(ic, "active", ""); _ibar_icon_signal_emit(ic, "e,state,focused", "e");
if (ic->ibar->show_label) if (ic->ibar->show_label)
_ibar_icon_signal_emit(ic, "label_active", ""); _ibar_icon_signal_emit(ic, "e,action,show,label", "e");
} }
static void static void
@ -863,9 +863,9 @@ _ibar_cb_icon_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
ev = event_info; ev = event_info;
ic = data; ic = data;
_ibar_icon_signal_emit(ic, "passive", ""); _ibar_icon_signal_emit(ic, "e,state,unfocused", "e");
if (ic->ibar->show_label) if (ic->ibar->show_label)
_ibar_icon_signal_emit(ic, "label_passive", ""); _ibar_icon_signal_emit(ic, "e,action,hide,label", "e");
} }
static void static void

View File

@ -533,11 +533,11 @@ _ibox_icon_fill(IBox_Icon *ic)
char *label; char *label;
ic->o_icon = e_border_icon_add(ic->border, evas_object_evas_get(ic->ibox->o_box)); ic->o_icon = e_border_icon_add(ic->border, evas_object_evas_get(ic->ibox->o_box));
edje_object_part_swallow(ic->o_holder, "item", ic->o_icon); edje_object_part_swallow(ic->o_holder, "e.swallow.content", ic->o_icon);
evas_object_pass_events_set(ic->o_icon, 1); evas_object_pass_events_set(ic->o_icon, 1);
evas_object_show(ic->o_icon); evas_object_show(ic->o_icon);
ic->o_icon2 = e_border_icon_add(ic->border, evas_object_evas_get(ic->ibox->o_box)); ic->o_icon2 = e_border_icon_add(ic->border, evas_object_evas_get(ic->ibox->o_box));
edje_object_part_swallow(ic->o_holder2, "item", ic->o_icon2); edje_object_part_swallow(ic->o_holder2, "e.swallow.content", ic->o_icon2);
evas_object_pass_events_set(ic->o_icon2, 1); evas_object_pass_events_set(ic->o_icon2, 1);
evas_object_show(ic->o_icon2); evas_object_show(ic->o_icon2);
@ -559,8 +559,8 @@ _ibox_icon_fill(IBox_Icon *ic)
} }
if (!label) label = "?"; if (!label) label = "?";
edje_object_part_text_set(ic->o_holder, "label", label); edje_object_part_text_set(ic->o_holder, "e.text.label", label);
edje_object_part_text_set(ic->o_holder2, "label", label); edje_object_part_text_set(ic->o_holder2, "e.text.label", label);
} }
static void static void
@ -646,9 +646,9 @@ _ibox_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
ev = event_info; ev = event_info;
ic = data; ic = data;
_ibox_icon_signal_emit(ic, "active", ""); _ibox_icon_signal_emit(ic, "e,state,focused", "e");
if (ic->ibox->show_label) if (ic->ibox->show_label)
_ibox_icon_signal_emit(ic, "label_active", ""); _ibox_icon_signal_emit(ic, "e,action,show,label", "e");
} }
static void static void
@ -659,9 +659,9 @@ _ibox_cb_icon_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
ev = event_info; ev = event_info;
ic = data; ic = data;
_ibox_icon_signal_emit(ic, "passive", ""); _ibox_icon_signal_emit(ic, "e,state,unfocused", "e");
if (ic->ibox->show_label) if (ic->ibox->show_label)
_ibox_icon_signal_emit(ic, "label_passive", ""); _ibox_icon_signal_emit(ic, "e,action,hide,label", "e");
} }
static void static void

View File

@ -399,14 +399,14 @@ _pager_desk_select(Pager_Desk *pd)
if (pd == pd2) if (pd == pd2)
{ {
pd2->current = 1; pd2->current = 1;
edje_object_signal_emit(pd2->o_desk, "active", ""); edje_object_signal_emit(pd2->o_desk, "e,state,selected", "e");
} }
else else
{ {
if (pd2->current) if (pd2->current)
{ {
pd2->current = 0; pd2->current = 0;
edje_object_signal_emit(pd2->o_desk, "passive", ""); edje_object_signal_emit(pd2->o_desk, "e,state,unselected", "e");
} }
} }
} }
@ -1502,9 +1502,9 @@ _pager_inst_cb_move(void *data, const char *type, void *event_info)
{ {
pd2 = l->data; pd2 = l->data;
if (pd == pd2) if (pd == pd2)
edje_object_signal_emit(pd2->o_desk, "drag", "in"); edje_object_signal_emit(pd2->o_desk, "e,action,drag,in", "e");
else else
edje_object_signal_emit(pd2->o_desk, "drag", "out"); edje_object_signal_emit(pd2->o_desk, "e,action,drag,out", "e");
} }
} }
@ -1524,7 +1524,7 @@ _pager_inst_cb_leave(void *data, const char *type, void *event_info)
Pager_Desk *pd; Pager_Desk *pd;
pd = l->data; pd = l->data;
edje_object_signal_emit(pd->o_desk, "drag", "out"); edje_object_signal_emit(pd->o_desk, "e,action,drag,out", "e");
} }
} }
@ -1589,7 +1589,7 @@ _pager_inst_cb_drop(void *data, const char *type, void *event_info)
for (l = inst->pager->desks; l; l = l->next) for (l = inst->pager->desks; l; l = l->next)
{ {
pd = l->data; pd = l->data;
edje_object_signal_emit(pd->o_desk, "drag", "out"); edje_object_signal_emit(pd->o_desk, "e,action,drag,out", "e");
} }
} }

View File

@ -54,7 +54,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
o = edje_object_add(gc->evas); o = edje_object_add(gc->evas);
e_theme_edje_object_set(o, "base/theme/modules/start", "modules/start/main"); e_theme_edje_object_set(o, "base/theme/modules/start", "modules/start/main");
edje_object_signal_emit(o, "passive", ""); edje_object_signal_emit(o, "e,state,unfocused", "e");
gcc = e_gadcon_client_new(gc, name, id, style, o); gcc = e_gadcon_client_new(gc, name, id, style, o);
gcc->data = inst; gcc->data = inst;
@ -196,7 +196,7 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
e_util_zone_current_get(e_manager_current_get()), e_util_zone_current_get(e_manager_current_get()),
x, y, w, h, x, y, w, h,
dir, ev->timestamp); dir, ev->timestamp);
edje_object_signal_emit(inst->o_button, "active", ""); edje_object_signal_emit(inst->o_button, "e,state,focused", "e");
evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
EVAS_BUTTON_NONE, ev->timestamp, NULL); EVAS_BUTTON_NONE, ev->timestamp, NULL);
} }
@ -210,7 +210,7 @@ _menu_cb_post(void *data, E_Menu *m)
inst = data; inst = data;
if (!inst->main_menu) return; if (!inst->main_menu) return;
edje_object_signal_emit(inst->o_button, "passive", ""); edje_object_signal_emit(inst->o_button, "e,state,unfocused", "e");
e_object_del(E_OBJECT(inst->main_menu)); e_object_del(E_OBJECT(inst->main_menu));
inst->main_menu = NULL; inst->main_menu = NULL;
} }

View File

@ -298,7 +298,7 @@ _temperature_cb_check(void *data)
for (l = temperature_config->instances; l; l = l->next) for (l = temperature_config->instances; l; l = l->next)
{ {
inst = l->data; inst = l->data;
edje_object_signal_emit(inst->o_temp, "known", ""); edje_object_signal_emit(inst->o_temp, "e,state,known", "");
} }
temperature_config->have_temp = 1; temperature_config->have_temp = 1;
} }
@ -315,7 +315,7 @@ _temperature_cb_check(void *data)
_temperature_face_level_set(inst, _temperature_face_level_set(inst,
(double)(temp - temperature_config->low) / (double)(temp - temperature_config->low) /
(double)(temperature_config->high - temperature_config->low)); (double)(temperature_config->high - temperature_config->low));
edje_object_part_text_set(inst->o_temp, "reading", utf8); edje_object_part_text_set(inst->o_temp, "e.text.reading", utf8);
} }
free(utf8); free(utf8);
} }
@ -327,8 +327,8 @@ _temperature_cb_check(void *data)
for (l = temperature_config->instances; l; l = l->next) for (l = temperature_config->instances; l; l = l->next)
{ {
inst = l->data; inst = l->data;
edje_object_signal_emit(inst->o_temp, "unknown", ""); edje_object_signal_emit(inst->o_temp, "e,state,unknown", "");
edje_object_part_text_set(inst->o_temp, "reading", "NO TEMP"); edje_object_part_text_set(inst->o_temp, "e.text.reading", "NO TEMP");
_temperature_face_level_set(inst, 0.5); _temperature_face_level_set(inst, 0.5);
} }
temperature_config->have_temp = 0; temperature_config->have_temp = 0;