diff options
| author | rephorm <rephorm> | 2006-08-22 07:39:11 +0000 |
|---|---|---|
| committer | rephorm <rephorm@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33> | 2006-08-22 07:39:11 +0000 |
| commit | a5c71890d4930286458ab7da4f8ee19efd5013e6 (patch) | |
| tree | 09b12a69a38a451dd71f4ca883515e23047f5df1 /data | |
| parent | 49c524e4c7b6dd3ae0786bef964fef167926f580 (diff) | |
| download | enlightenment-a5c71890d4930286458ab7da4f8ee19efd5013e6.tar.gz | |
****** 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
Diffstat (limited to 'data')
41 files changed, 779 insertions, 766 deletions
diff --git a/data/images/e.png b/data/images/e.png Binary files differindex 47597a8d44..3d15954b21 100644 --- a/data/images/e.png +++ b/data/images/e.png diff --git a/data/themes/default_about.edc b/data/themes/default_about.edc index 64b90cecc7..433bb9e946 100644 --- a/data/themes/default_about.edc +++ b/data/themes/default_about.edc @@ -232,11 +232,11 @@ group { description { state: "default" 0.0; rel1 { - to: "about"; + to: "e.text.about"; offset: -7 -7; } rel2 { - to: "about"; + to: "e.text.about"; offset: 6 6; } image { @@ -251,11 +251,11 @@ group { description { state: "default" 0.0; rel1 { - to: "authors"; + to: "e.text.authors"; offset: -7 -7; } rel2 { - to: "authors"; + to: "e.text.authors"; offset: 6 6; } image { @@ -302,7 +302,7 @@ group { } } part { - name: "about"; + name: "e.text.about"; type: TEXTBLOCK; mouse_events: 0; description { @@ -310,7 +310,7 @@ group { max: 200 1000; min: 200 0; rel1 { - to_y: "version"; + to_y: "e.text.version"; relative: 0.0 1.0; offset: 16 8; } @@ -327,7 +327,7 @@ group { } } part { - name: "authors"; + name: "e.text.authors"; type: TEXTBLOCK; mouse_events: 0; description { @@ -335,7 +335,7 @@ group { max: 1000 1000; min: 200 0; rel1 { - to_y: "version"; + to_y: "e.text.version"; to_x: "logo"; relative: 1.0 1.0; offset: 8 8; @@ -386,7 +386,7 @@ group { } } part { - name: "title"; + name: "e.text.title"; type: TEXT; effect: SOFT_SHADOW; mouse_events: 0; @@ -415,7 +415,7 @@ group { } } part { - name: "version"; + name: "e.text.version"; type: TEXT; effect: SOFT_SHADOW; mouse_events: 0; @@ -424,12 +424,12 @@ group { fixed: 0 1; align: 0.5 0.0; rel1 { - to: "title"; + to: "e.text.title"; relative: 0.0 1.0; offset: 6 2; } rel2 { - to: "title"; + to: "e.text.title"; relative: 1.0 1.0; offset: -7 2; } @@ -458,12 +458,12 @@ group { rel1 { relative: 0.5 0.5; offset: 0 0; - to_y: "about"; + to_y: "e.text.about"; } rel2 { relative: 0.5 0.5; offset: 0 0; - to_y: "about"; + to_y: "e.text.about"; } image { normal: "e17_logo.png"; @@ -549,7 +549,7 @@ group { name: "button_unclick2"; signal: "mouse,clicked,1"; source: "button"; - action: SIGNAL_EMIT "close" ""; + action: SIGNAL_EMIT "e,action,close" ""; } program { diff --git a/data/themes/default_battery.edc b/data/themes/default_battery.edc index aae0705016..e7e2dd4f37 100644 --- a/data/themes/default_battery.edc +++ b/data/themes/default_battery.edc @@ -232,43 +232,43 @@ group { programs { program { name: "charge"; - signal: "charge"; - source: ""; + signal: "e,state,charging"; + source: "e"; action: STATE_SET "default" 0.0; target: "fade_clip"; } program { name: "charge2"; - signal: "charge"; - source: ""; + signal: "e,state,charging"; + source: "e"; action: STATE_SET "active" 0.0; target: "ac"; } program { name: "discharge"; - signal: "discharge"; - source: ""; + signal: "e,state,discharging"; + source: "e"; action: STATE_SET "default" 0.0; target: "fade_clip"; } program { name: "discharge2"; - signal: "discharge"; - source: ""; + signal: "e,state,discharging"; + source: "e"; action: STATE_SET "default" 0.0; target: "ac"; } program { name: "unknown"; - signal: "unknown"; - source: ""; + signal: "e,state,unknown"; + source: "e"; action: STATE_SET "faded" 0.0; target: "fade_clip"; } program { name: "pulse"; - signal: "pulse"; - source: ""; + signal: "e,action,pulse,start"; + source: "e"; action: STATE_SET "faded" 0.0; transition: ACCELERATE 0.3; after: "pulse2"; @@ -277,15 +277,15 @@ group { program { name: "pulse2"; signal: "pulse2"; - source: ""; + source: "e"; action: STATE_SET "faded" 1.0; transition: ACCELERATE 0.1; target: "pulse_clip"; } program { name: "pulsestop"; - signal: "pulsestop"; - source: ""; + signal: "e,action,pulse,stop"; + source: "e"; action: STATE_SET "default" 0.0; target: "pulse_clip"; } diff --git a/data/themes/default_border.edc b/data/themes/default_border.edc index 8b4cab703c..a62630dd31 100644 --- a/data/themes/default_border.edc +++ b/data/themes/default_border.edc @@ -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; \ type: RECT; \ 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; \ } \ - } + } \ + 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) \ group { \ @@ -291,8 +302,8 @@ group { offset: 0 7; } text { - text_source: "title_text"; - source: "title_text"; + text_source: "e.text.title"; + source: "e.text.title"; min: 0 1; text_class: "title_bar"; } @@ -789,7 +800,7 @@ group { } } part { - name: "title_text"; + name: "e.text.title"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -1013,7 +1024,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; description { state: "default" 0.0; @@ -1031,7 +1042,7 @@ group { } } part { - name: "resize_l"; + name: "e.event.resize.l"; type: RECT; description { state: "default" 0.0; @@ -1048,7 +1059,7 @@ group { } } part { - name: "resize_r"; + name: "e.event.resize.r"; type: RECT; description { state: "default" 0.0; @@ -1065,7 +1076,7 @@ group { } } part { - name: "resize_b"; + name: "e.event.resize.b"; type: RECT; description { state: "default" 0.0; @@ -1081,7 +1092,7 @@ group { } } part { - name: "resize_bl"; + name: "e.event.resize.bl"; type: RECT; description { state: "default" 0.0; @@ -1097,7 +1108,7 @@ group { } } part { - name: "resize_br"; + name: "e.event.resize.br"; type: RECT; description { state: "default" 0.0; @@ -1113,7 +1124,7 @@ group { } } part { - name: "client"; + name: "e.client"; type: SWALLOW; description { 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") part { - name: "icon"; + name: "e.event.icon"; type: RECT; description { state: "default" 0.0; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; } color: 0 0 0 0; } } part { - name: "title"; + name: "e.event.titlebar"; type: RECT; description { state: "default" 0.0; @@ -1167,8 +1178,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_outline"; target: "title_bar"; @@ -1244,8 +1255,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_outline"; target: "title_bar"; @@ -1471,8 +1482,8 @@ group { } program { name: "maximize_fullscreen"; - signal: "maximize,fullscreen"; - source: ""; + signal: "e,action,maximize,fullscreen"; + source: "e"; action: STATE_SET "hidden" 0.0; target: "t1"; target: "t3"; @@ -1484,8 +1495,8 @@ group { } program { name: "unmaximize_fullscreen"; - signal: "unmaximize,fullscreen"; - source: ""; + signal: "e,action,unmaximize,fullscreen"; + source: "e"; action: STATE_SET "default" 0.0; target: "t1"; target: "t3"; @@ -1498,8 +1509,8 @@ group { program { name: "go_hung"; - signal: "hung"; - source: ""; + signal: "e,state,hung"; + source: "e"; action: STATE_SET "hung" 0.0; target: "title_hung"; transition: DECELERATE 0.5; @@ -1514,8 +1525,8 @@ group { } program { name: "go_unhung"; - signal: "unhung"; - source: ""; + signal: "e,state,unhung"; + source: "e"; action: ACTION_STOP; target: "go_hung"; target: "go_hung2"; @@ -1571,8 +1582,8 @@ group { offset: 0 7; } text { - text_source: "title_text"; - source: "title_text"; + text_source: "e.text.title"; + source: "e.text.title"; min: 0 1; text_class: "title_bar"; } @@ -1654,7 +1665,7 @@ group { } } part { - name: "resize_br"; + name: "e.event.resize.br"; description { state: "default" 0.0; rel1 { @@ -1692,7 +1703,7 @@ group { } } part { - name: "resize_bl"; + name: "e.event.resize.bl"; description { state: "default" 0.0; rel1 { @@ -1924,7 +1935,7 @@ group { } } part { - name: "title_text"; + name: "e.text.title"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -2148,7 +2159,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; description { state: "default" 0.0; @@ -2166,20 +2177,20 @@ group { } } part { - name: "client"; + name: "e.client"; type: SWALLOW; description { state: "default" 0.0; rel1 { relative: 0.0 1.0; offset: 4 0; - to_x: "resize_bl"; + to_x: "e.event.resize.bl"; to_y: "t1"; } rel2 { relative: 1.0 1.0; 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") part { - name: "icon"; + name: "e.event.icon"; type: RECT; description { state: "default" 0.0; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; } color: 0 0 0 0; } } part { - name: "title"; + name: "e.event.titlebar"; type: RECT; description { state: "default" 0.0; @@ -2220,8 +2231,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_outline"; target: "title_bar"; @@ -2297,8 +2308,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_outline"; target: "title_bar"; @@ -2524,25 +2535,25 @@ group { } program { name: "maximize_fullscreen"; - signal: "maximize,fullscreen"; - source: ""; + signal: "e,action,maximize,fullscreen"; + source: "e"; action: STATE_SET "hidden" 0.0; - target: "resize_bl"; - target: "resize_br"; + target: "e.event.resize.bl"; + target: "e.event.resize.br"; } program { name: "unmaximize_fullscreen"; - signal: "unmaximize,fullscreen"; - source: ""; + signal: "e,action,unmaximize,fullscreen"; + source: "e"; action: STATE_SET "default" 0.0; - target: "resize_bl"; - target: "resize_br"; + target: "e.event.resize.bl"; + target: "e.event.resize.br"; } program { name: "go_hung"; - signal: "hung"; - source: ""; + signal: "e,state,hung"; + source: "e"; action: STATE_SET "hung" 0.0; target: "title_hung"; transition: DECELERATE 0.5; @@ -2557,8 +2568,8 @@ group { } program { name: "go_unhung"; - signal: "unhung"; - source: ""; + signal: "e,state,unhung"; + source: "e"; action: ACTION_STOP; target: "go_hung"; target: "go_hung2"; @@ -2614,8 +2625,8 @@ group { offset: 0 7; } text { - text_source: "title_text"; - source: "title_text"; + text_source: "e.text.title"; + source: "e.text.title"; min: 0 1; text_class: "title_bar"; } @@ -3112,7 +3123,7 @@ group { } } part { - name: "title_text"; + name: "e.text.title"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -3336,7 +3347,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; description { state: "default" 0.0; @@ -3354,7 +3365,7 @@ group { } } part { - name: "resize_l"; + name: "e.event.resize.l"; type: RECT; description { state: "default" 0.0; @@ -3371,7 +3382,7 @@ group { } } part { - name: "resize_r"; + name: "e.event.resize.r"; type: RECT; description { state: "default" 0.0; @@ -3388,7 +3399,7 @@ group { } } part { - name: "resize_b"; + name: "e.event.resize.b"; type: RECT; description { state: "default" 0.0; @@ -3404,7 +3415,7 @@ group { } } part { - name: "resize_bl"; + name: "e.event.resize.bl"; type: RECT; description { state: "default" 0.0; @@ -3420,7 +3431,7 @@ group { } } part { - name: "resize_br"; + name: "e.event.resize.br"; type: RECT; description { state: "default" 0.0; @@ -3436,7 +3447,7 @@ group { } } part { - name: "client"; + name: "e.client"; type: SWALLOW; description { 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") part { - name: "icon"; + name: "e.event.icon"; type: RECT; description { state: "default" 0.0; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; } color: 0 0 0 0; } } part { - name: "title"; + name: "e.event.titlebar"; type: RECT; description { state: "default" 0.0; @@ -3488,8 +3499,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_outline"; target: "title_bar"; @@ -3565,8 +3576,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_outline"; target: "title_bar"; @@ -3663,8 +3674,8 @@ group { program { name: "maximize_fullscreen"; - signal: "maximize,fullscreen"; - source: ""; + signal: "e,action,maximize,fullscreen"; + source: "e"; action: STATE_SET "hidden" 0.0; target: "t1"; target: "t3"; @@ -3676,8 +3687,8 @@ group { } program { name: "unmaximize_fullscreen"; - signal: "unmaximize,fullscreen"; - source: ""; + signal: "e,action,unmaximize,fullscreen"; + source: "e"; action: STATE_SET "default" 0.0; target: "t1"; target: "t3"; @@ -3690,8 +3701,8 @@ group { program { name: "go_hung"; - signal: "hung"; - source: ""; + signal: "e,state,hung"; + source: "e"; action: STATE_SET "hung" 0.0; target: "title_hung"; transition: DECELERATE 0.5; @@ -3706,8 +3717,8 @@ group { } program { name: "go_unhung"; - signal: "unhung"; - source: ""; + signal: "e,state,unhung"; + source: "e"; action: ACTION_STOP; target: "go_hung"; target: "go_hung2"; @@ -3763,8 +3774,8 @@ group { offset: 0 7; } text { - text_source: "title_text"; - source: "title_text"; + text_source: "e.text.title"; + source: "e.text.title"; min: 0 1; text_class: "title_bar"; } @@ -4261,7 +4272,7 @@ group { } } part { - name: "title_text"; + name: "e.text.title"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -4485,7 +4496,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; description { state: "default" 0.0; @@ -4503,7 +4514,7 @@ group { } } part { - name: "client"; + name: "e.client"; type: SWALLOW; description { 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") part { - name: "icon"; + name: "e.event.icon"; type: RECT; description { state: "default" 0.0; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; } color: 0 0 0 0; } } part { - name: "title"; + name: "e.event.titlebar"; type: RECT; description { state: "default" 0.0; @@ -4555,8 +4566,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_outline"; target: "title_bar"; @@ -4632,8 +4643,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_outline"; target: "title_bar"; @@ -4730,8 +4741,8 @@ group { program { name: "maximize_fullscreen"; - signal: "maximize,fullscreen"; - source: ""; + signal: "e,action,maximize,fullscreen"; + source: "e"; action: STATE_SET "hidden" 0.0; target: "t1"; target: "t3"; @@ -4743,8 +4754,8 @@ group { } program { name: "unmaximize_fullscreen"; - signal: "unmaximize,fullscreen"; - source: ""; + signal: "e,action,unmaximize,fullscreen"; + source: "e"; action: STATE_SET "default" 0.0; target: "t1"; target: "t3"; @@ -4757,8 +4768,8 @@ group { program { name: "go_hung"; - signal: "hung"; - source: ""; + signal: "e,state,hung"; + source: "e"; action: STATE_SET "hung" 0.0; target: "title_hung"; transition: DECELERATE 0.5; @@ -4773,8 +4784,8 @@ group { } program { name: "go_unhung"; - signal: "unhung"; - source: ""; + signal: "e,state,unhung"; + source: "e"; action: ACTION_STOP; target: "go_hung"; target: "go_hung2"; @@ -4862,7 +4873,7 @@ group { } } part { - name: "client"; + name: "e.client"; type: SWALLOW; description { state: "default" 0.0; diff --git a/data/themes/default_button.edc b/data/themes/default_button.edc index b8887d88c7..23551ece4e 100644 --- a/data/themes/default_button.edc +++ b/data/themes/default_button.edc @@ -61,7 +61,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; description { state: "default" 0.0; @@ -98,7 +98,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -107,7 +107,7 @@ group { rel1 { relative: 1.0 0.0; offset: 4 8; - to_x: "icon_swallow"; + to_x: "e.swallow.icon"; to_y: "button_image"; } rel2 { @@ -327,14 +327,14 @@ group { name: "button_unclick2"; signal: "mouse,clicked,1"; source: "button_image"; - action: SIGNAL_EMIT "click" ""; + action: SIGNAL_EMIT "e,action,click" ""; } program { name: "icon_visible"; - signal: "icon_visible"; - source: ""; + signal: "e,action,show,icon"; + source: "e"; action: STATE_SET "visible" 0.0; - target: "icon_swallow"; + target: "e.swallow.icon"; } program { name: "button_in"; @@ -395,37 +395,37 @@ group { } program { name: "focus_in"; - signal: "focus_in"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "focused" 0.0; transition: DECELERATE 0.2; target: "focus"; } program { name: "focus_out"; - signal: "focus_out"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "default" 0.0; transition: ACCELERATE 0.5; target: "focus"; } program { name: "disable"; - signal: "disabled"; - source: ""; + signal: "e,state,disabled"; + source: "e"; action: STATE_SET "disabled" 0.0; target: "button_image"; target: "button_image2"; - target: "label"; + target: "e.text.label"; } program { name: "enable"; - signal: "enabled"; - source: ""; + signal: "e,state,enabled"; + source: "e"; action: STATE_SET "default" 0.0; target: "button_image"; target: "button_image2"; - target: "label"; + target: "e.text.label"; } } } diff --git a/data/themes/default_check.edc b/data/themes/default_check.edc index 0563e0e7c1..c4d49a6c15 100644 --- a/data/themes/default_check.edc +++ b/data/themes/default_check.edc @@ -63,7 +63,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -137,15 +137,15 @@ group { programs { program { name: "turn_on1"; - signal: "toggle_on"; - source: ""; + signal: "e,state,checked"; + source: "e"; action: STATE_SET "active" 0.0; target: "item1"; } program { name: "turn_off1"; - signal: "toggle_off"; - source: ""; + signal: "e,state,unchecked"; + source: "e"; action: STATE_SET "default" 0.0; target: "item1"; } @@ -153,41 +153,41 @@ group { name: "click"; signal: "mouse,down,1"; source: "event"; - action: SIGNAL_EMIT "toggled" ""; + action: SIGNAL_EMIT "e,action,toggle" ""; } program { name: "focus_in"; - signal: "focus_in"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "focused" 0.0; transition: DECELERATE 0.2; target: "focus"; } program { name: "focus_out"; - signal: "focus_out"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "default" 0.0; transition: ACCELERATE 0.5; target: "focus"; } program { name: "disable"; - signal: "disabled"; - source: ""; + signal: "e,state,disabled"; + source: "e"; action: STATE_SET "disabled" 0.0; target: "outline"; target: "event"; - target: "label"; + target: "e.text.label"; } program { name: "enable"; - signal: "enabled"; - source: ""; + signal: "e,state,enabled"; + source: "e"; action: STATE_SET "default" 0.0; target: "outline"; target: "event"; - target: "label"; + target: "e.text.label"; } } } @@ -251,7 +251,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; clip_to: "icon_clip"; @@ -277,7 +277,7 @@ group { offset: 2 2; } rel2 { - to_y: "label"; + to_y: "e.text.label"; relative: 1.0 0.0; offset: -2 -2; } @@ -291,10 +291,10 @@ group { state: "default" 0.0; min: 16 16; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; } color: 255 255 255 255; } @@ -305,7 +305,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -379,22 +379,22 @@ group { programs { program { name: "label_on"; - signal: "label_visible"; - source: ""; + signal: "e,state,labeled"; + source: "e"; action: STATE_SET "label_visible" 0.0; - target: "icon_swallow"; + target: "e.swallow.icon"; } program { name: "turn_on1"; - signal: "toggle_on"; - source: ""; + signal: "e,state,checked"; + source: "e"; action: STATE_SET "active" 0.0; target: "item1"; } program { name: "turn_off1"; - signal: "toggle_off"; - source: ""; + signal: "e,state,unchecked"; + source: "e"; action: STATE_SET "default" 0.0; target: "item1"; } @@ -402,41 +402,41 @@ group { name: "click"; signal: "mouse,down,1"; source: "event"; - action: SIGNAL_EMIT "toggled" "on"; + action: SIGNAL_EMIT "e,action,toggle" ""; // XXX ,on? } program { name: "focus_in"; - signal: "focus_in"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "focused" 0.0; transition: DECELERATE 0.2; target: "focus"; } program { name: "focus_out"; - signal: "focus_out"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "default" 0.0; transition: ACCELERATE 0.5; target: "focus"; } program { name: "disable"; - signal: "disabled"; - source: ""; + signal: "e,state,disabled"; + source: "e"; action: STATE_SET "disabled" 0.0; target: "outline"; target: "event"; - target: "label"; + target: "e.text.label"; } program { name: "enable"; - signal: "enabled"; - source: ""; + signal: "e,state,enabled"; + source: "e"; action: STATE_SET "default" 0.0; target: "outline"; target: "event"; - target: "label"; + target: "e.text.label"; } } } diff --git a/data/themes/default_color_well.edc b/data/themes/default_color_well.edc index 7162fc8c57..43306a6259 100644 --- a/data/themes/default_color_well.edc +++ b/data/themes/default_color_well.edc @@ -44,7 +44,7 @@ group { } } part { - name: "content"; + name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "content_clip"; @@ -80,7 +80,7 @@ group { name: "send_click"; signal: "mouse,clicked,1"; source: "overlay"; - action: SIGNAL_EMIT "click" ""; + action: SIGNAL_EMIT "e,action,click" ""; } } } diff --git a/data/themes/default_configure.edc b/data/themes/default_configure.edc index ee27d88e3a..24c2c74a7a 100644 --- a/data/themes/default_configure.edc +++ b/data/themes/default_configure.edc @@ -120,7 +120,7 @@ group { } } part { - name: "item"; + name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; @@ -139,7 +139,7 @@ group { } } part { - name: "button"; + name: "e.swallow.button"; type: SWALLOW; mouse_events: 1; description { @@ -148,7 +148,7 @@ group { align: 0.5 1.0; fixed: 0 1; rel1 { - to_y: "item"; + to_y: "e.swallow.content"; relative: 0.5 1.0; offset: 0 2; } @@ -314,7 +314,7 @@ group { program { name: "button_in"; signal: "mouse,in"; - source: "button"; + source: "e.swallow.button"; script { run_program(PROGRAM:"go_active"); } diff --git a/data/themes/default_cpufreq.edc b/data/themes/default_cpufreq.edc index 08175a849e..f7faef76ca 100644 --- a/data/themes/default_cpufreq.edc +++ b/data/themes/default_cpufreq.edc @@ -382,7 +382,7 @@ group { name: "next_governor"; signal: "mouse,down,1"; source: "cpu"; - action: SIGNAL_EMIT "next_governor" "governor"; + action: SIGNAL_EMIT "e,action,governor,next" ""; } program { name: "next_governor2"; @@ -402,7 +402,7 @@ group { name: "increase_frequency"; signal: "mouse,down,1"; source: "increase"; - action: SIGNAL_EMIT "increase_frequency" "frequency"; + action: SIGNAL_EMIT "e,action,frequency,increase" ""; } program { name: "increase_frequency2"; @@ -422,7 +422,7 @@ group { name: "decrease_frequency"; signal: "mouse,down,1"; source: "decrease"; - action: SIGNAL_EMIT "decrease_frequency" "frequency"; + action: SIGNAL_EMIT "e,action,frequency,decrease" ""; } program { name: "decrease_frequency2"; @@ -440,15 +440,15 @@ group { } program { name: "enabled"; - signal: "active"; - source: ""; + signal: "e,state,enabled"; + source: "e"; action: STATE_SET "default" 0.0; target: "fade_clip"; } program { name: "disabled"; - signal: "passive"; - source: ""; + signal: "e,state,disabled"; + source: "e"; action: STATE_SET "faded" 0.0; target: "fade_clip"; } diff --git a/data/themes/default_cslider.edc b/data/themes/default_cslider.edc index 18b7de37e9..80a8ba3a30 100644 --- a/data/themes/default_cslider.edc +++ b/data/themes/default_cslider.edc @@ -45,7 +45,7 @@ group { } } part { - name: "content"; + name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "content_clip"; @@ -61,11 +61,11 @@ group { } } part { - name: "cursor"; + name: "e.dragable.cursor"; type: RECT; clip_to: "content_clip"; dragable { - confine: "content"; + confine: "e.swallow.content"; x: 1 1 0; y: -1 1 0; } @@ -75,12 +75,12 @@ group { max: 1 9999; fixed: 1 1; rel1 { - to: "content"; + to: "e.swallow.content"; relative: 0.5 0; offset: 0 0; } rel2 { - to: "content"; + to: "e.swallow.content"; relative: 0.5 1; offset: 0 -1; } @@ -91,12 +91,12 @@ group { max: 9999 1; fixed: 1 1; rel1 { - to: "content"; + to: "e.swallow.content"; relative: 0 0.5 ; offset: 0 0; } rel2 { - to: "content"; + to: "e.swallow.content"; relative: 1 0.5; offset: -1 0; } @@ -123,10 +123,10 @@ group { programs { program { name: "go_vertical"; - signal: "e,direction,v"; - source: ""; + signal: "e,state,direction,v"; + source: "e"; action: STATE_SET "vertical" 0.0; - target: "cursor"; + target: "e.dragable.cursor"; target: "background"; } } diff --git a/data/themes/default_desklock.edc b/data/themes/default_desklock.edc index 31d1176a0f..4fc75e0ab3 100644 --- a/data/themes/default_desklock.edc +++ b/data/themes/default_desklock.edc @@ -57,7 +57,7 @@ group } part { - name: "title"; + name: "e.text.title"; type: TEXT; effect: SHADOW; description { @@ -112,7 +112,7 @@ group } part { - name: "passwd"; + name: "e.text.password"; type: TEXT; effect: SHADOW; clip_to: "passwd_entry_clip"; @@ -161,12 +161,12 @@ group rel1 { relative: 1.0 0.0; offset: 0 -2; - to: "passwd"; + to: "e.text.password"; } rel2 { relative: 1.0 0.9; offset: 0 0; - to: "passwd"; + to: "e.text.password"; } image { normal: "e17_entry_cursor.png"; diff --git a/data/themes/default_dialog.edc b/data/themes/default_dialog.edc index abb84a8b00..787b3dfffa 100644 --- a/data/themes/default_dialog.edc +++ b/data/themes/default_dialog.edc @@ -81,7 +81,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; description { state: "default" 0.0; @@ -95,12 +95,12 @@ group { rel2 { relative: 0.0 0.0; offset: 16 -9; - to_y: "buttons_swallow"; + to_y: "e.swallow.buttons"; } } } part { - name: "content_swallow"; + name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; @@ -108,12 +108,12 @@ group { rel1 { relative: 1.0 0.0; offset: 8 16; - to_x: "icon_swallow"; + to_x: "e.swallow.icon"; } rel2 { relative: 1.0 0.0; offset: -17 -9; - to_y: "buttons_swallow"; + to_y: "e.swallow.buttons"; } } } @@ -125,7 +125,7 @@ group { rel1 { relative: 0.0 1.0; offset: 1 -3; - to_y: "content_swallow"; + to_y: "e.swallow.content"; } rel2 { relative: 1.0 1.0; @@ -141,7 +141,7 @@ group { } } part { - name: "buttons_swallow"; + name: "e.swallow.buttons"; type: SWALLOW; description { state: "default" 0.0; @@ -165,7 +165,7 @@ group { name: "widgets/dialog/text"; parts { part { - name: "text"; + name: "e.textblock.message"; type: TEXTBLOCK; mouse_events: 0; description { diff --git a/data/themes/default_entry.edc b/data/themes/default_entry.edc index 8759f074a9..b606060213 100644 --- a/data/themes/default_entry.edc +++ b/data/themes/default_entry.edc @@ -39,7 +39,7 @@ group { } } part { - name: "text_area"; + name: "e.swallow.text"; type: SWALLOW; description { state: "default" 0.0; @@ -80,7 +80,7 @@ group { name: "widgets/entry/text"; parts { part { - name: "text"; + name: "e.text.text"; type: TEXT; mouse_events: 0; description { @@ -121,8 +121,8 @@ group { programs { program { name: "on_cursor_show"; - signal: "cursor_show"; - source: ""; + signal: "e,action,show,cursor"; + source: "e"; action: ACTION_STOP; target: "cursor_show"; target: "cursor_hide"; diff --git a/data/themes/default_error.edc b/data/themes/default_error.edc index b68def76de..853728d48f 100644 --- a/data/themes/default_error.edc +++ b/data/themes/default_error.edc @@ -104,7 +104,7 @@ group { } } part { - name: "title"; + name: "e.text.title"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -133,7 +133,7 @@ group { } } part { - name: "text"; + name: "e.text.message"; type: TEXTBLOCK; mouse_events: 0; description { @@ -242,7 +242,7 @@ group { } program { name: "button_unclick2"; - action: SIGNAL_EMIT "close" ""; + action: SIGNAL_EMIT "e,action,close" ""; } } } diff --git a/data/themes/default_exebuf.edc b/data/themes/default_exebuf.edc index a25cc6b43d..ce5d9c312f 100644 --- a/data/themes/default_exebuf.edc +++ b/data/themes/default_exebuf.edc @@ -80,7 +80,7 @@ group { } part { - name: "eap_list_swallow"; + name: "e.swallow.eap_list"; type: SWALLOW; clip_to: "eap_list_clip"; description { @@ -95,7 +95,7 @@ group { rel2 { relative: 1.0 0.0; offset: -17 -17; - to_y: "label"; + to_y: "e.text.label"; } } } @@ -108,12 +108,12 @@ group { rel1 { relative: 0.0 0.0; offset: 0 0; - to_y: "eap_list_swallow"; + to_y: "e.swallow.eap_list"; } rel2 { relative: 1.0 1.0; offset: -1 -1; - to_y: "eap_list_swallow"; + to_y: "e.swallow.eap_list"; } } } @@ -129,7 +129,7 @@ group { rel2 { relative: 1.0 0.0; offset: -2 16; - to_y: "eap_list_swallow"; + to_y: "e.swallow.eap_list"; } image { normal: "e17_winlist_top.png"; @@ -148,12 +148,12 @@ group { rel1 { relative: 0.0 1.0; offset: 1 -3; - to_y: "eap_list_swallow"; + to_y: "e.swallow.eap_list"; } rel2 { relative: 1.0 1.0; offset: -2 16; - to_y: "label"; + to_y: "e.text.label"; } image { normal: "e17_winlist_bottom.png"; @@ -166,7 +166,7 @@ group { } part { - name: "exe_list_swallow"; + name: "e.swallow.exe_list"; type: SWALLOW; clip_to: "exe_list_clip"; description { @@ -177,7 +177,7 @@ group { rel1 { relative: 0.0 1.0; offset: 16 16; - to_y: "label"; + to_y: "e.text.label"; } rel2 { relative: 1.0 1.0; @@ -194,12 +194,12 @@ group { rel1 { relative: 0.0 0.0; offset: 0 0; - to_y: "exe_list_swallow"; + to_y: "e.swallow.exe_list"; } rel2 { relative: 1.0 1.0; offset: -1 -1; - to_y: "exe_list_swallow"; + to_y: "e.swallow.exe_list"; } } } @@ -211,12 +211,12 @@ group { rel1 { relative: 0.0 0.0; offset: 1 -15; - to_y: "label"; + to_y: "e.text.label"; } rel2 { relative: 1.0 0.0; offset: -2 16; - to_y: "exe_list_swallow"; + to_y: "e.swallow.exe_list"; } image { normal: "e17_winlist_top.png"; @@ -235,7 +235,7 @@ group { rel1 { relative: 0.0 1.0; offset: 1 -3; - to_y: "exe_list_swallow"; + to_y: "e.swallow.exe_list"; } rel2 { relative: 1.0 1.0; @@ -253,7 +253,7 @@ group { part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; description { @@ -264,12 +264,12 @@ group { rel1 { relative: 1.0 0.5; offset: 16 0; - to_x: "icon_swallow"; + to_x: "e.swallow.icons"; } rel2 { relative: 1.0 0.5; offset: 16 0; - to_x: "icon_swallow"; + to_x: "e.swallow.icons"; } color: 0 0 0 255; color3: 255 255 255 128; @@ -295,12 +295,12 @@ group { rel1 { relative: 1.0 0.0; offset: 3 0; - to: "label"; + to: "e.text.label"; } rel2 { relative: 1.0 1.0; offset: 3 -1; - to: "label"; + to: "e.text.label"; } image { normal: "e17_entry_cursor.png"; @@ -308,7 +308,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icons"; type: SWALLOW; description { state: "default" 0.0; @@ -319,12 +319,12 @@ group { rel1 { relative: 0.0 0.0; offset: 16 -7; - to_y: "label"; + to_y: "e.text.label"; } rel2 { relative: 1.0 1.0; offset: 16 8; - to_y: "label"; + to_y: "e.text.label"; } } } @@ -334,12 +334,12 @@ group { description { state: "default" 0.0; rel1 { - to: "icon_swallow"; + to: "e.swallow.icons"; relative: 0.0 0.0; offset: -8 -8; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icons"; relative: 1.0 1.0; offset: 7 7; } @@ -365,7 +365,7 @@ group { rel1 { relative: 1.0 0.0; offset: 1 -1; - to_x: "icon_swallow"; + to_x: "e.swallow.icons"; } rel2 { relative: 1.0 1.0; @@ -543,15 +543,15 @@ group { offset: 0 6; } text { - text_source: "title_text"; - source: "title_text"; + text_source: "e.text.title"; + source: "e.text.title"; min: 0 1; text_class: "title_bar"; } } } part { - name: "title_text"; + name: "e.text.title"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -560,7 +560,7 @@ group { rel1 { relative: 1.0 0.0; offset: 9 6; - to_x: "icon_swallow"; + to_x: "e.swallow.icons"; } rel2 { relative: 1.0 1.0; @@ -744,7 +744,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icons"; type: SWALLOW; description { state: "default" 0.0; @@ -767,8 +767,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_outline"; target: "title_bar"; @@ -844,8 +844,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_outline"; target: "title_bar"; diff --git a/data/themes/default_fileman.edc b/data/themes/default_fileman.edc index 0e8438ee2c..8be251ec30 100644 --- a/data/themes/default_fileman.edc +++ b/data/themes/default_fileman.edc @@ -183,12 +183,12 @@ group { visible: 0; align: 0.5 0.5; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; relative: 0.0 0.0; offset: -1 -1; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; relative: 1.0 1.0; offset: 0 0; } @@ -307,7 +307,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -323,7 +323,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -528,8 +528,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -603,8 +603,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -633,8 +633,8 @@ group { } program { name: "thumb_gen"; - signal: "thumb"; - source: "gen"; + signal: "e,action,thumb,gen"; + source: "e"; action: STATE_SET "visible" 0.0; target: "icon_box_shadow"; target: "icon_box"; @@ -643,8 +643,8 @@ group { } program { name: "thumb_gen-"; - signal: "thumb"; - source: "gen_alpha"; + signal: "e,action,thumb,gen,alpha"; + source: "e"; action: STATE_SET "default" 0.0; target: "icon_box_shadow"; target: "icon_box"; @@ -858,12 +858,12 @@ group { visible: 0; align: 0.5 0.5; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; relative: 0.0 0.0; offset: -1 -1; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; relative: 1.0 1.0; offset: 0 0; } @@ -982,7 +982,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -998,7 +998,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -1203,8 +1203,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -1278,8 +1278,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -1308,8 +1308,8 @@ group { } program { name: "thumb_gen"; - signal: "thumb"; - source: "gen"; + signal: "e,action,thumb,gen"; + source: "e"; action: STATE_SET "visible" 0.0; target: "icon_box_shadow"; target: "icon_box"; @@ -1318,8 +1318,8 @@ group { } program { name: "thumb_gen-"; - signal: "thumb"; - source: "gen_alpha"; + signal: "e,action,thumb,gen,alpha"; + source: "e"; action: STATE_SET "default" 0.0; target: "icon_box_shadow"; target: "icon_box"; @@ -1533,12 +1533,12 @@ group { visible: 0; align: 0.5 0.5; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; relative: 0.0 0.0; offset: -1 -1; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; relative: 1.0 1.0; offset: 0 0; } @@ -1656,7 +1656,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -1672,7 +1672,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -1877,8 +1877,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -1952,8 +1952,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -1982,8 +1982,8 @@ group { } program { name: "thumb_gen"; - signal: "thumb"; - source: "gen"; + signal: "e,action,thumb,gen"; + source: "e"; action: STATE_SET "visible" 0.0; target: "icon_box_shadow"; target: "icon_box"; @@ -1992,8 +1992,8 @@ group { } program { name: "thumb_gen-"; - signal: "thumb"; - source: "gen_alpha"; + signal: "e,action,thumb,gen,alpha"; + source: "e"; action: STATE_SET "default" 0.0; target: "icon_box_shadow"; target: "icon_box"; @@ -2207,12 +2207,12 @@ group { visible: 0; align: 0.5 0.5; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; relative: 0.0 0.0; offset: -1 -1; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; relative: 1.0 1.0; offset: 0 0; } @@ -2331,7 +2331,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -2347,7 +2347,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -2552,8 +2552,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -2627,8 +2627,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -2657,8 +2657,8 @@ group { } program { name: "thumb_gen"; - signal: "thumb"; - source: "gen"; + signal: "e,action,thumb,gen"; + source: "e"; action: STATE_SET "visible" 0.0; target: "icon_box_shadow"; target: "icon_box"; @@ -2667,8 +2667,8 @@ group { } program { name: "thumb_gen-"; - signal: "thumb"; - source: "gen_alpha"; + signal: "e,action,thumb,gen,alpha"; + source: "e"; action: STATE_SET "default" 0.0; target: "icon_box_shadow"; target: "icon_box"; @@ -2740,7 +2740,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -2752,14 +2752,14 @@ group { offset: 4 4; } rel2 { - to_y: "label"; + to_y: "e.text.label"; relative: 1.0 0.0; offset: -5 -2; } } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -2801,19 +2801,19 @@ group { programs { program { name: "active"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "active" 0.0; - target: "label"; + target: "e.text.label"; target: "icon_overlay"; } program { name: "passive"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "default" 0.0; transition: LINEAR 0.2; - target: "label"; + target: "e.text.label"; target: "icon_overlay"; } } @@ -2848,7 +2848,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -2860,14 +2860,14 @@ group { offset: 4 4; } rel2 { - to_y: "label"; + to_y: "e.text.label"; relative: 1.0 0.0; offset: -5 -2; } } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -2909,19 +2909,19 @@ group { programs { program { name: "active"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "active" 0.0; - target: "label"; + target: "e.text.label"; target: "icon_overlay"; } program { name: "passive"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "default" 0.0; transition: LINEAR 0.2; - target: "label"; + target: "e.text.label"; target: "icon_overlay"; } } @@ -2962,7 +2962,7 @@ group { } } part { - name: "busy_label"; + name: "e.text.busy_label"; type: TEXT; effect: SOFT_SHADOW; clip_to: "busy_clip"; @@ -3011,16 +3011,16 @@ group { programs { program { name: "go1"; - signal: "busy"; - source: "start"; + signal: "e,state,busy,start"; + source: "e"; action: STATE_SET "active" 0.0; transition: SINUSOIDAL 1.0; target: "busy_clip"; } program { name: "go2"; - signal: "busy"; - source: "start"; + signal: "e,state,busy,start"; + source: "e"; action: STATE_SET "default" 0.0; transition: LINEAR 0.5; target: "busy"; @@ -3028,8 +3028,8 @@ group { } program { name: "stop1"; - signal: "busy"; - source: "stop"; + signal: "e,state,busy,stop"; + source: "e"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 1.0; target: "busy_clip"; @@ -4229,7 +4229,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -4435,7 +4435,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -4495,7 +4495,7 @@ group { name: "fileman/icon_list"; parts { part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -4519,7 +4519,7 @@ group { description { state: "default" 0.0; rel1 { - to_x: "icon_swallow"; + to_x: "e.swallow.icon"; relative: 1.0 0.0; offset: 2 2; } @@ -4555,7 +4555,7 @@ group { effect: NONE; description { rel1 { - to_x: "icon_swallow"; + to_x: "e.swallow.icon"; relative: 1.0 0.0; offset: 2 2; } diff --git a/data/themes/default_filesel.edc b/data/themes/default_filesel.edc index 2f9ec0914c..d374985a25 100644 --- a/data/themes/default_filesel.edc +++ b/data/themes/default_filesel.edc @@ -1,3 +1,5 @@ +/* this file looks like its deprecated and should probably be removed */ + images { image: "e17_ibar_bg_h.png" COMP; image: "e17_ibar_over_h.png" COMP; diff --git a/data/themes/default_frame.edc b/data/themes/default_frame.edc index 4b7d8b0f4e..901fc9bba0 100644 --- a/data/themes/default_frame.edc +++ b/data/themes/default_frame.edc @@ -7,7 +7,7 @@ group { name: "widgets/frame"; parts { part { - name: "items"; + name: "e.swallow.content"; mouse_events: 0; type: SWALLOW; description { @@ -32,7 +32,7 @@ group { description { state: "default" 0.0; rel1 { - to_y: "label"; + to_y: "e.text.label"; relative: 0.0 0.5; offset: 2 -1; } @@ -75,7 +75,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; mouse_events: 0; description { @@ -107,12 +107,12 @@ group { description { state: "default" 0.0; rel1 { - to: "label"; + to: "e.text.label"; relative: 0.0 0.0; offset: -5 -4; } rel2 { - to: "label"; + to: "e.text.label"; relative: 1.0 1.0; offset: 2 2; } diff --git a/data/themes/default_ibar.edc b/data/themes/default_ibar.edc index f204b49afc..1ca6de2d4d 100644 --- a/data/themes/default_ibar.edc +++ b/data/themes/default_ibar.edc @@ -85,16 +85,16 @@ group { } program { name: "exec_start"; - signal: "start"; - source: ""; + signal: "e,action,start"; + source: "e"; action: STATE_SET "faded" 0.0; transition: LINEAR 0.5; target: "item_clip"; } program { name: "exec_exec"; - signal: "exec"; - source: ""; + signal: "e,action,exec"; + source: "e"; action: STATE_SET "faded" 0.0; transition: LINEAR 0.5; target: "item_clip"; @@ -102,8 +102,8 @@ group { } program { name: "exec_stop"; - signal: "stop"; - source: ""; + signal: "e,action,stop"; + source: "e"; action: STATE_SET "default" 0.0; target: "item_clip"; } @@ -195,7 +195,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SOFT_SHADOW; mouse_events: 0; @@ -240,19 +240,19 @@ group { programs { program { name: "go_active"; - signal: "active"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "visible" 0.0; target: "background"; after: "go_active2"; } program { name: "go_activeB"; - signal: "label_active"; - source: ""; + signal: "e,action,show,label"; + source: "e"; action: STATE_SET "visible" 0.0; transition: SINUSOIDAL 0.5; - target: "label"; + target: "e.text.label"; } program { name: "go_active2"; @@ -265,8 +265,8 @@ group { } program { name: "go_passive"; - signal: "passive"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: ACTION_STOP; target: "go_active"; target: "go_active2"; @@ -274,11 +274,11 @@ group { } program { name: "go_passiveB"; - signal: "label_passive"; - source: ""; + signal: "e,action,hide,label"; + source: "e"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 1.0; - target: "label"; + target: "e.text.label"; } program { name: "go_passive2"; @@ -301,8 +301,8 @@ group { } program { name: "exec_start"; - signal: "start"; - source: ""; + signal: "e,action,start"; + source: "e"; action: ACTION_STOP; target: "go_active"; target: "go_active2"; @@ -314,14 +314,14 @@ group { } program { name: "exec_exec"; - signal: "exec"; - source: ""; + signal: "e,action,exec"; + source: "e"; after: "exec_start"; } program { name: "exec_stop"; - signal: "stop"; - source: ""; + signal: "e,action,stop"; + source: "e"; // action: SIGNAL_EMIT "active" 0.0; } } diff --git a/data/themes/default_ibox.edc b/data/themes/default_ibox.edc index 86d46b3b67..0c8333fbd9 100644 --- a/data/themes/default_ibox.edc +++ b/data/themes/default_ibox.edc @@ -27,7 +27,7 @@ group { } } part { - name: "item"; + name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "item_clip"; @@ -73,7 +73,7 @@ group { source: "over"; action: STATE_SET "bigger" 0.0; transition: LINEAR 0.1; - target: "item"; + target: "e.swallow.content"; } program { name: "hover_out"; @@ -81,20 +81,20 @@ group { source: "over"; action: STATE_SET "default" 0.0; transition: LINEAR 0.2; - target: "item"; + target: "e.swallow.content"; } program { name: "exec_start"; - signal: "start"; - source: ""; + signal: "e,action,start"; + source: "e"; action: STATE_SET "faded" 0.0; transition: LINEAR 0.5; target: "item_clip"; } program { name: "exec_exec"; - signal: "exec"; - source: ""; + signal: "e,action,exec"; + source: "e"; action: STATE_SET "faded" 0.0; transition: LINEAR 0.5; target: "item_clip"; @@ -102,8 +102,8 @@ group { } program { name: "exec_stop"; - signal: "stop"; - source: ""; + signal: "e,action,stop"; + source: "e"; action: STATE_SET "default" 0.0; target: "item_clip"; } @@ -179,7 +179,7 @@ group { } } part { - name: "item"; + name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "background"; @@ -195,7 +195,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SOFT_SHADOW; mouse_events: 0; @@ -240,19 +240,19 @@ group { programs { program { name: "go_active"; - signal: "active"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "visible" 0.0; target: "background"; after: "go_active2"; } program { name: "go_activeB"; - signal: "label_active"; - source: ""; + signal: "e,action,show,label"; + source: "e"; action: STATE_SET "visible" 0.0; transition: SINUSOIDAL 0.5; - target: "label"; + target: "e.text.label"; } program { name: "go_active2"; @@ -265,8 +265,8 @@ group { } program { name: "go_passive"; - signal: "passive"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: ACTION_STOP; target: "go_active"; target: "go_active2"; @@ -274,11 +274,11 @@ group { } program { name: "go_passiveB"; - signal: "label_passive"; - source: ""; + signal: "e,action,hide,label"; + source: "e"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 1.0; - target: "label"; + target: "e.text.label"; } program { name: "go_passive2"; @@ -301,8 +301,8 @@ group { } program { name: "exec_start"; - signal: "start"; - source: ""; + signal: "e,action,start"; + source: "e"; action: ACTION_STOP; target: "go_active"; target: "go_active2"; @@ -314,14 +314,14 @@ group { } program { name: "exec_exec"; - signal: "exec"; - source: ""; + signal: "e,action,exec"; + source: "e"; after: "exec_start"; } program { name: "exec_stop"; - signal: "stop"; - source: ""; + signal: "e,action,stop"; + source: "e"; // action: SIGNAL_EMIT "active" 0.0; } } diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc index 221c6e9848..8c69fbdbe4 100644 --- a/data/themes/default_icons.edc +++ b/data/themes/default_icons.edc @@ -115,16 +115,16 @@ group { programs { program { name: "e_in"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "hilited" 0.0; transition: LINEAR 0.5; target: "e_glow"; } program { name: "e_out"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "default" 0.0; transition: LINEAR 0.5; target: "e_glow"; @@ -176,16 +176,16 @@ group { programs { program { name: "power_button_in"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "hilited" 0.0; transition: LINEAR 0.5; target: "power_button_glow"; } program { name: "power_button_out"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "default" 0.0; transition: LINEAR 0.5; target: "power_button_glow"; @@ -237,16 +237,16 @@ group { programs { program { name: "reset_button_in"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "hilited" 0.0; transition: LINEAR 0.5; target: "reset_button_glow"; } program { name: "reset_button_out"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "default" 0.0; transition: LINEAR 0.5; target: "reset_button_glow"; @@ -469,16 +469,16 @@ group { programs { program { name: "fileman_button_in"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "hilited" 0.0; transition: LINEAR 0.5; target: "fileman_button_glow"; } program { name: "fileman_button_out"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "default" 0.0; transition: LINEAR 0.5; target: "fileman_button_glow"; @@ -1385,9 +1385,10 @@ group { } gradient { spectrum: "black_to_trans"; - } - fill { - angle: 270; + rel1.relative: 0 0.5; + rel1.offset: 0 0; + rel2.relative: 1 0.5; + rel2.offset: -1 0; } } } @@ -1427,9 +1428,6 @@ group { gradient { spectrum: "black_to_trans"; } - fill { - angle: 0; - } } } part { @@ -1467,9 +1465,10 @@ group { } gradient { spectrum: "black_to_trans"; - } - fill { - angle: 225; + rel1.relative: 0 1; + rel1.offset: 0 -1; + rel2.relative: 1 0; + rel2.offset: -1 0; } } } @@ -1508,9 +1507,10 @@ group { } gradient { spectrum: "black_to_trans"; - } - fill { - angle: 315; + rel1.relative: 0 0; + rel1.offset: 0 0; + rel2.relative: 1 1; + rel2.offset: -1 -1; } } } diff --git a/data/themes/default_ilist.edc b/data/themes/default_ilist.edc index ffe3ae560b..4b93b82cc4 100644 --- a/data/themes/default_ilist.edc +++ b/data/themes/default_ilist.edc @@ -138,7 +138,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -158,7 +158,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -166,7 +166,7 @@ group { state: "default" 0.0; min: 16 16; rel1 { - to_x: "icon_swallow"; + to_x: "e.swallow.icon"; relative: 1.0 0.0; offset: 4 4; } @@ -363,8 +363,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -438,8 +438,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -605,7 +605,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -625,7 +625,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -633,7 +633,7 @@ group { state: "default" 0.0; min: 16 16; rel1 { - to_x: "icon_swallow"; + to_x: "e.swallow.icon"; relative: 1.0 0.0; offset: 4 4; } @@ -830,8 +830,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -905,8 +905,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -952,7 +952,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { @@ -972,7 +972,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SOFT_SHADOW; mouse_events: 0; @@ -980,7 +980,7 @@ group { state: "default" 0.0; min: 16 16; rel1 { - to_x: "icon_swallow"; + to_x: "e.swallow.icon"; relative: 1.0 0.0; offset: 16 4; } diff --git a/data/themes/default_label.edc b/data/themes/default_label.edc index a9e74779ad..d50a35b786 100644 --- a/data/themes/default_label.edc +++ b/data/themes/default_label.edc @@ -2,7 +2,7 @@ group { name: "widgets/label"; parts { part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; diff --git a/data/themes/default_menu.edc b/data/themes/default_menu.edc index 919113277f..6ea9dfc03d 100644 --- a/data/themes/default_menu.edc +++ b/data/themes/default_menu.edc @@ -80,7 +80,7 @@ group { } } part { - name: "title"; + name: "e.text.title"; type: TEXT; effect: SOFT_SHADOW; mouse_events: 0; @@ -127,13 +127,13 @@ group { } } part { - name: "items"; + name: "e.swallow.content"; mouse_events: 0; type: SWALLOW; description { state: "default" 0.0; rel1 { - to_y: "title"; + to_y: "e.text.title"; relative: 0.0 1.0; offset: 1 0; } @@ -148,17 +148,17 @@ group { programs { program { name: "on"; - signal: "title,on"; - source: ""; + signal: "e,action,show,title"; + source: "e"; action: STATE_SET "active" 0.0; - target: "title"; + target: "e.text.title"; } program { name: "off"; - signal: "title,off"; - source: ""; + signal: "e,action,hide,title"; + source: "e"; action: STATE_SET "default" 0.0; - target: "title"; + target: "e.text.title"; } } } @@ -194,7 +194,7 @@ group { name: "widgets/menu/default/item_bg"; parts { part { - name: "item"; + name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; @@ -215,7 +215,7 @@ group { name: "widgets/menu/default/submenu_bg"; parts { part { - name: "item"; + name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; @@ -301,15 +301,15 @@ group { programs { program { name: "turn_on1"; - signal: "toggle_on"; - source: ""; + signal: "e,state,on"; + source: "e"; action: STATE_SET "active" 0.0; target: "item1"; } program { name: "turn_off1"; - signal: "toggle_off"; - source: ""; + signal: "e,state,off"; + source: "e"; action: STATE_SET "default" 0.0; target: "item1"; } @@ -384,15 +384,15 @@ group { programs { program { name: "turn_on1"; - signal: "toggle_on"; - source: ""; + signal: "e,state,on"; + source: "e"; action: STATE_SET "active" 0.0; target: "item1"; } program { name: "turn_off1"; - signal: "toggle_off"; - source: ""; + signal: "e,state,off"; + source: "e"; action: STATE_SET "default" 0.0; target: "item1"; } @@ -402,7 +402,7 @@ group { name: "widgets/menu/default/icon"; parts { part { - name: "item"; + name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; @@ -608,7 +608,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -803,8 +803,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_outline"; target: "title_bar"; @@ -880,8 +880,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_outline"; target: "title_bar"; diff --git a/data/themes/default_move.edc b/data/themes/default_move.edc index f16f43bb9f..b86dc3b39d 100644 --- a/data/themes/default_move.edc +++ b/data/themes/default_move.edc @@ -69,7 +69,7 @@ group { } } part { - name: "text"; + name: "e.text.label"; type: TEXT; effect: SHADOW; description { diff --git a/data/themes/default_pager.edc b/data/themes/default_pager.edc index 4990d351a2..80d4f464be 100644 --- a/data/themes/default_pager.edc +++ b/data/themes/default_pager.edc @@ -501,8 +501,8 @@ group { programs { program { name: "go_active3b"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_glint_1"; target: "title_glint_2"; @@ -546,8 +546,8 @@ group { } program { name: "go_active_content"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "active" 0.0; transition: SINUSOIDAL 0.25; target: "clip"; @@ -556,8 +556,8 @@ group { } program { name: "go_passive"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 1.0; target: "clip"; @@ -566,24 +566,24 @@ group { } program { name: "set_active"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; script { set_int(active, 1); } } program { name: "set_passive"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; script { set_int(active, 0); } } program { name: "drag_in"; - signal: "drag"; - source: "in"; + signal: "e,action,drag,in"; + source: "e"; script { if (get_int(drag) == 0) { set_state(PART:"overlay", "drag", 0.0); @@ -593,8 +593,8 @@ group { } program { name: "drag_out"; - signal: "drag"; - source: "out"; + signal: "e,action,drag,out"; + source: "e"; script { if (get_int(drag) == 1) { if (get_int(active) == 1) diff --git a/data/themes/default_pointer.edc b/data/themes/default_pointer.edc index 25d605e582..79d5957216 100644 --- a/data/themes/default_pointer.edc +++ b/data/themes/default_pointer.edc @@ -33,7 +33,7 @@ group { */ } part { - name: "hotspot"; + name: "e.swallow.hotspot"; type: SWALLOW; mouse_events: 0; description { diff --git a/data/themes/default_preview.edc b/data/themes/default_preview.edc index 34ac49b1c7..55a8f2f0d9 100644 --- a/data/themes/default_preview.edc +++ b/data/themes/default_preview.edc @@ -12,11 +12,11 @@ group { description { state: "default" 0.0; rel1 { - to: "item"; + to: "e.swallow.content"; offset: -3 -3; } rel2 { - to: "item"; + to: "e.swallow.content"; offset: 2 2; } image { @@ -35,15 +35,15 @@ group { description { state: "default" 0.0; rel1 { - to: "item"; + to: "e.swallow.content"; } rel2 { - to: "item"; + to: "e.swallow.content"; } } } part { - name: "item"; + name: "e.swallow.content"; clip_to: "clipper"; type: SWALLOW; mouse_events: 0; diff --git a/data/themes/default_radio.edc b/data/themes/default_radio.edc index b11fbc39ec..1fe6f8c79d 100644 --- a/data/themes/default_radio.edc +++ b/data/themes/default_radio.edc @@ -63,7 +63,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -137,15 +137,15 @@ group { programs { program { name: "turn_on1"; - signal: "toggle_on"; - source: ""; + signal: "e,state,on"; + source: "e"; action: STATE_SET "active" 0.0; target: "item1"; } program { name: "turn_off1"; - signal: "toggle_off"; - source: ""; + signal: "e,state,off"; + source: "e"; action: STATE_SET "default" 0.0; target: "item1"; } @@ -153,41 +153,41 @@ group { name: "click"; signal: "mouse,down,1"; source: "event"; - action: SIGNAL_EMIT "toggled" "on"; + action: SIGNAL_EMIT "e,action,toggle" ""; } program { name: "focus_in"; - signal: "focus_in"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "focused" 0.0; transition: DECELERATE 0.2; target: "focus"; } program { name: "focus_out"; - signal: "focus_out"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "default" 0.0; transition: ACCELERATE 0.5; target: "focus"; } program { name: "disable"; - signal: "disabled"; - source: ""; + signal: "e,state,disabled"; + source: "e"; action: STATE_SET "disabled" 0.0; target: "outline"; target: "event"; - target: "label"; + target: "e.text.label"; } program { name: "enable"; - signal: "enabled"; - source: ""; + signal: "e,state,enabled"; + source: "e"; action: STATE_SET "default" 0.0; target: "outline"; target: "event"; - target: "label"; + target: "e.text.label"; } } } @@ -251,7 +251,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; clip_to: "icon_clip"; @@ -277,7 +277,7 @@ group { offset: 2 2; } rel2 { - to_y: "label"; + to_y: "e.text.label"; relative: 1.0 0.0; offset: -2 -2; } @@ -291,10 +291,10 @@ group { state: "default" 0.0; min: 16 16; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; } color: 255 255 255 255; } @@ -318,7 +318,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -393,23 +393,23 @@ group { programs { program { name: "label_on"; - signal: "label_visible"; - source: ""; + signal: "e,state,labeled"; + source: "e"; action: STATE_SET "label_visible" 0.0; - target: "icon_swallow"; + target: "e.swallow.icon"; target: "label_clip"; } program { name: "turn_on1"; - signal: "toggle_on"; - source: ""; + signal: "e,state,on"; + source: "e"; action: STATE_SET "active" 0.0; target: "item1"; } program { name: "turn_off1"; - signal: "toggle_off"; - source: ""; + signal: "e,state,off"; + source: "e"; action: STATE_SET "default" 0.0; target: "item1"; } @@ -417,42 +417,42 @@ group { name: "click"; signal: "mouse,down,1"; source: "event"; - action: SIGNAL_EMIT "toggled" "on"; + action: SIGNAL_EMIT "e,action,toggle" ""; } program { name: "focus_in"; - signal: "focus_in"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "focused" 0.0; transition: DECELERATE 0.2; target: "focus"; } program { name: "focus_out"; - signal: "focus_out"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "default" 0.0; transition: ACCELERATE 0.5; target: "focus"; } program { name: "disable"; - signal: "disabled"; - source: ""; + signal: "e,state,disabled"; + source: "e"; action: STATE_SET "disabled" 0.0; target: "outline"; target: "event"; - target: "label"; + target: "e.text.label"; target: "icon_clip"; } program { name: "enable"; - signal: "enabled"; - source: ""; + signal: "e,state,enabled"; + source: "e"; action: STATE_SET "default" 0.0; target: "outline"; target: "event"; - target: "label"; + target: "e.text.label"; target: "icon_clip"; } } diff --git a/data/themes/default_resize.edc b/data/themes/default_resize.edc index 11d4dea4d2..5039c554a7 100644 --- a/data/themes/default_resize.edc +++ b/data/themes/default_resize.edc @@ -69,7 +69,7 @@ group { } } part { - name: "text"; + name: "e.text.label"; type: TEXT; effect: SHADOW; description { diff --git a/data/themes/default_scrollframe.edc b/data/themes/default_scrollframe.edc index 2798c89eb1..db993f44d2 100644 --- a/data/themes/default_scrollframe.edc +++ b/data/themes/default_scrollframe.edc @@ -188,7 +188,7 @@ group { rel2 { relative: 1.0 0.0; offset: -1 -1; - to: "vbar_bar"; + to: "e.dragable.vbar"; } } } @@ -203,7 +203,7 @@ group { rel1 { relative: 0.0 1.0; offset: 0 0; - to: "vbar_bar"; + to: "e.dragable.vbar"; } rel2 { relative: 1.0 0.0; @@ -213,7 +213,7 @@ group { } } part { - name: "vbar_bar"; + name: "e.dragable.vbar"; clip_to: "sb_vbar"; mouse_events: 1; dragable { @@ -256,10 +256,10 @@ group { max: 8 8; min: 8 8; rel1 { - to: "vbar_bar"; + to: "e.dragable.vbar"; } rel2 { - to: "vbar_bar"; + to: "e.dragable.vbar"; } image { normal: "e17_scrollbar_vdrag_thumb.png"; @@ -424,7 +424,7 @@ group { rel2 { relative: 0.0 1.0; offset: -1 -1; - to: "hbar_bar"; + to: "e.dragable.hbar"; } } } @@ -439,7 +439,7 @@ group { rel1 { relative: 1.0 0.0; offset: 0 0; - to: "hbar_bar"; + to: "e.dragable.hbar"; } rel2 { relative: 0.0 1.0; @@ -449,7 +449,7 @@ group { } } part { - name: "hbar_bar"; + name: "e.dragable.hbar"; clip_to: "sb_hbar"; mouse_events: 1; dragable { @@ -492,10 +492,10 @@ group { max: 8 8; min: 8 8; rel1 { - to: "hbar_bar"; + to: "e.dragable.hbar"; } rel2 { - to: "hbar_bar"; + to: "e.dragable.hbar"; } image { normal: "e17_scrollbar_hdrag_thumb.png"; @@ -593,29 +593,29 @@ group { programs { program { name: "sb_vbar_show"; - signal: "vbar"; - source: "show"; + signal: "e,action,show,vbar"; + source: "e"; action: STATE_SET "default" 0.0; target: "sb_vbar"; } program { name: "sb_vbar_hide"; - signal: "vbar"; - source: "hide"; + signal: "e,action,hide,vbar"; + source: "e"; action: STATE_SET "hidden" 0.0; target: "sb_vbar"; } program { name: "sb_hbar_show"; - signal: "hbar"; - source: "show"; + signal: "e,action,show,hbar"; + source: "e"; action: STATE_SET "default" 0.0; target: "sb_hbar"; } program { name: "sb_hbar_hide"; - signal: "hbar"; - source: "hide"; + signal: "e,action,hide,hbar"; + source: "e"; action: STATE_SET "hidden" 0.0; target: "sb_hbar"; } @@ -632,7 +632,7 @@ group { signal: "mouse,down,1"; source: "sb_vbar_a1"; action: DRAG_VAL_STEP 0.0 -1.0; - target: "vbar_bar"; + target: "e.dragable.vbar"; } program { name: "sb_vbar_a1_up"; @@ -653,7 +653,7 @@ group { signal: "mouse,down,1"; source: "sb_vbar_a2"; action: DRAG_VAL_STEP 0.0 1.0; - target: "vbar_bar"; + target: "e.dragable.vbar"; } program { name: "sb_vbar_a2_up"; @@ -667,28 +667,28 @@ group { signal: "mouse,down,1"; source: "sb_vbar_p1"; action: DRAG_VAL_PAGE 0.0 -1.0; - target: "vbar_bar"; + target: "e.dragable.vbar"; } program { name: "sb_vbar_p2_down"; signal: "mouse,down,1"; source: "sb_vbar_p2"; action: DRAG_VAL_PAGE 0.0 1.0; - target: "vbar_bar"; + target: "e.dragable.vbar"; } program { name: "sb_vbar_down"; signal: "mouse,down,1"; - source: "vbar_bar"; + source: "e.dragable.vbar"; action: STATE_SET "clicked" 0.0; - target: "vbar_bar"; + target: "e.dragable.vbar"; } program { name: "sb_vbar_up"; signal: "mouse,up,1"; - source: "vbar_bar"; + source: "e.dragable.vbar"; action: STATE_SET "default" 0.0; - target: "vbar_bar"; + target: "e.dragable.vbar"; } program { name: "sb_hbar_a1_down"; @@ -702,7 +702,7 @@ group { signal: "mouse,down,1"; source: "sb_hbar_a1"; action: DRAG_VAL_STEP -1.0 0.0; - target: "hbar_bar"; + target: "e.dragable.hbar"; } program { name: "sb_hbar_a1_up"; @@ -723,7 +723,7 @@ group { signal: "mouse,down,1"; source: "sb_hbar_a2"; action: DRAG_VAL_STEP 1.0 0.0; - target: "hbar_bar"; + target: "e.dragable.hbar"; } program { name: "sb_hbar_a2_up"; @@ -737,41 +737,41 @@ group { signal: "mouse,down,1"; source: "sb_hbar_p1"; action: DRAG_VAL_PAGE -1.0 0.0; - target: "hbar_bar"; + target: "e.dragable.hbar"; } program { name: "sb_hbar_p2_down"; signal: "mouse,down,1"; source: "sb_hbar_p2"; action: DRAG_VAL_PAGE 1.0 0.0; - target: "hbar_bar"; + target: "e.dragable.hbar"; } program { name: "sb_hbar_down"; signal: "mouse,down,1"; - source: "hbar_bar"; + source: "e.dragable.hbar"; action: STATE_SET "clicked" 0.0; - target: "hbar_bar"; + target: "e.dragable.hbar"; } program { name: "sb_hbar_up"; signal: "mouse,up,1"; - source: "hbar_bar"; + source: "e.dragable.hbar"; action: STATE_SET "default" 0.0; - target: "hbar_bar"; + target: "e.dragable.hbar"; } program { name: "focus_in"; - signal: "focus_in"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "focused" 0.0; transition: DECELERATE 0.2; target: "focus"; } program { name: "focus_out"; - signal: "focus_out"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "default" 0.0; transition: ACCELERATE 0.5; target: "focus"; diff --git a/data/themes/default_shelf.edc b/data/themes/default_shelf.edc index b37e6250af..3a0c75a5ea 100644 --- a/data/themes/default_shelf.edc +++ b/data/themes/default_shelf.edc @@ -184,7 +184,7 @@ group { } } part { - name: "items"; + name: "e.swallow.content"; mouse_events: 0; type: SWALLOW; description { @@ -324,99 +324,99 @@ group { programs { program { name: "orient1"; - signal: "set_orientation"; - source: "top"; + signal: "e,state,orientation,top"; + source: "e"; action: STATE_SET "default" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient2"; - signal: "set_orientation"; - source: "top_left"; + signal: "e,state,orientation,top_left"; + source: "e"; action: STATE_SET "top_left" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient3"; - signal: "set_orientation"; - source: "top_right"; + signal: "e,state,orientation,top_right"; + source: "e"; action: STATE_SET "top_right" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient4"; - signal: "set_orientation"; - source: "bottom"; + signal: "e,state,orientation,bottom"; + source: "e"; action: STATE_SET "bottom" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient5"; - signal: "set_orientation"; - source: "bottom_left"; + signal: "e,state,orientation,bottom_left"; + source: "e"; action: STATE_SET "bottom_left" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient6"; - signal: "set_orientation"; - source: "bottom_right"; + signal: "e,state,orientation,bottom_right"; + source: "e"; action: STATE_SET "bottom_right" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient7"; - signal: "set_orientation"; - source: "left"; + signal: "e,state,orientation,left"; + source: "e"; action: STATE_SET "left" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient8"; - signal: "set_orientation"; - source: "left_top"; + signal: "e,state,orientation,left_top"; + source: "e"; action: STATE_SET "left_top" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient9"; - signal: "set_orientation"; - source: "left_bottom"; + signal: "e,state,orientation,left_bottom"; + source: "e"; action: STATE_SET "left_bottom" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient10"; - signal: "set_orientation"; - source: "right"; + signal: "e,state,orientation,right"; + source: "e"; action: STATE_SET "right" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient11"; - signal: "set_orientation"; - source: "right_top"; + signal: "e,state,orientation,right_top"; + source: "e"; action: STATE_SET "right_top" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient12"; - signal: "set_orientation"; - source: "right_bottom"; + signal: "e,state,orientation,right_bottom"; + source: "e"; action: STATE_SET "right_bottom" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } } } @@ -461,7 +461,7 @@ group { } } part { - name: "items"; + name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "items_clip"; @@ -693,7 +693,7 @@ group { } } part { - name: "items"; + name: "e.swallow.content"; mouse_events: 0; type: SWALLOW; description { @@ -833,99 +833,99 @@ group { programs { program { name: "orient1"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "top"; action: STATE_SET "default" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient2"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "top_left"; action: STATE_SET "top_left" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient3"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "top_right"; action: STATE_SET "top_right" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient4"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "bottom"; action: STATE_SET "bottom" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient5"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "bottom_left"; action: STATE_SET "bottom_left" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient6"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "bottom_right"; action: STATE_SET "bottom_right" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient7"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "left"; action: STATE_SET "left" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient8"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "left_top"; action: STATE_SET "left_top" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient9"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "left_bottom"; action: STATE_SET "left_bottom" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient10"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "right"; action: STATE_SET "right" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient11"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "right_top"; action: STATE_SET "right_top" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } program { name: "orient12"; - signal: "set_orientation"; + signal: "e,state,orientation,"; source: "right_bottom"; action: STATE_SET "right_bottom" 0.0; target: "base"; - target: "items"; + target: "e.swallow.content"; } } } @@ -970,7 +970,7 @@ group { } } part { - name: "items"; + name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "items_clip"; @@ -1024,7 +1024,7 @@ group { } parts { part { - name: "items"; + name: "e.swallow.content"; mouse_events: 0; type: SWALLOW; description { @@ -1074,7 +1074,7 @@ group { } } part { - name: "items"; + name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "items_clip"; diff --git a/data/themes/default_slider.edc b/data/themes/default_slider.edc index 036621fd45..f290f0d00f 100644 --- a/data/themes/default_slider.edc +++ b/data/themes/default_slider.edc @@ -94,7 +94,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; mouse_events: 0; clip_to: "clip"; @@ -120,7 +120,7 @@ group { size: 10; min: 1 1; align: 0.5 0.5; - text_class: "slider"; + text_class: "e.dragable.slider"; } } } @@ -138,12 +138,12 @@ group { description { state: "active" 0.0; rel1 { - to: "label"; + to: "e.text.label"; relative: 0.0 0.0; offset: -5 -4; } rel2 { - to: "label"; + to: "e.text.label"; relative: 1.0 1.0; offset: 2 3; } @@ -166,7 +166,7 @@ group { rel2 { relative: 1.0 0.0; offset: -1 -1; - to: "slider"; + to: "e.dragable.slider"; } } } @@ -180,12 +180,12 @@ group { rel1 { relative: 0.0 1.0; offset: 0 0; - to: "slider"; + to: "e.dragable.slider"; } } } part { - name: "slider"; + name: "e.dragable.slider"; type: RECT; mouse_events: 1; dragable { @@ -218,10 +218,10 @@ group { min: 32 32; fixed: 1 1; rel1 { - to: "slider"; + to: "e.dragable.slider"; } rel2 { - to: "slider"; + to: "e.dragable.slider"; } image { normal: "e17_slider_bt0.png"; @@ -317,33 +317,33 @@ group { signal: "mouse,down,1"; source: "sld_p1"; action: DRAG_VAL_PAGE 0.0 -1.0; - target: "slider"; + target: "e.dragable.slider"; } program { name: "sld_p2_down"; signal: "mouse,down,1"; source: "sld_p2"; action: DRAG_VAL_PAGE 0.0 1.0; - target: "slider"; + target: "e.dragable.slider"; } program { name: "sld_down"; signal: "mouse,down,1"; - source: "slider"; + source: "e.dragable.slider"; action: STATE_SET "clicked" 0.0; target: "slider_img"; } program { name: "sld_up"; signal: "mouse,up,1"; - source: "slider"; + source: "e.dragable.slider"; action: STATE_SET "default" 0.0; target: "slider_img"; } program { name: "sld_in"; signal: "mouse,in"; - source: "slider"; + source: "e.dragable.slider"; action: STATE_SET "visible" 0.0; transition: SINUSOIDAL 1.0; target: "slider_glow"; @@ -359,59 +359,59 @@ group { program { name: "sld_out"; signal: "mouse,out"; - source: "slider"; + source: "e.dragable.slider"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 1.0; target: "slider_glow"; } program { name: "focus_in"; - signal: "focus_in"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "focused" 0.0; transition: DECELERATE 0.2; target: "focus"; } program { name: "focus_out"; - signal: "focus_out"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "default" 0.0; transition: ACCELERATE 0.5; target: "focus"; } program { - name: "show_label"; - signal: "show_label"; - source: ""; + name: "e,action,show,label"; + signal: "e,action,show,label"; + source: "e"; action: STATE_SET "active" 0.0; target: "sld_base"; target: "label_under"; - target: "label"; + target: "e.text.label"; target: "label_over"; } program { - name: "hide_label"; - signal: "hide_label"; - source: ""; + name: "e,action,hide,label"; + signal: "e,action,hide,label"; + source: "e"; action: STATE_SET "default" 0.0; target: "sld_base"; target: "label_under"; - target: "label"; + target: "e.text.label"; target: "label_over"; } program { name: "disable"; - signal: "disabled"; - source: ""; + signal: "e,state,disabled"; + source: "e"; action: STATE_SET "disabled" 0.0; target: "clip"; target: "catch"; } program { name: "enable"; - signal: "enabled"; - source: ""; + signal: "e,state,enabled"; + source: "e"; action: STATE_SET "default" 0.0; target: "clip"; target: "catch"; @@ -504,7 +504,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; mouse_events: 0; clip_to: "clip"; @@ -531,7 +531,7 @@ group { size: 10; min: 1 1; align: 0.5 0.5; - text_class: "slider"; + text_class: "e.dragable.slider"; } } } @@ -549,12 +549,12 @@ group { description { state: "active" 0.0; rel1 { - to: "label"; + to: "e.text.label"; relative: 0.0 0.0; offset: -5 -4; } rel2 { - to: "label"; + to: "e.text.label"; relative: 1.0 1.0; offset: 2 3; } @@ -577,7 +577,7 @@ group { rel2 { relative: 0.0 1.0; offset: -1 -1; - to: "slider"; + to: "e.dragable.slider"; } } } @@ -591,12 +591,12 @@ group { rel1 { relative: 1.0 0.0; offset: 0 0; - to: "slider"; + to: "e.dragable.slider"; } } } part { - name: "slider"; + name: "e.dragable.slider"; type: RECT; mouse_events: 1; dragable { @@ -630,10 +630,10 @@ group { min: 32 32; fixed: 1 1; rel1 { - to: "slider"; + to: "e.dragable.slider"; } rel2 { - to: "slider"; + to: "e.dragable.slider"; } image { normal: "e17_slider_bt0.png"; @@ -728,33 +728,33 @@ group { signal: "mouse,down,1"; source: "sld_p1"; action: DRAG_VAL_PAGE -1.0 0.0; - target: "slider"; + target: "e.dragable.slider"; } program { name: "sld_p2_down"; signal: "mouse,down,1"; source: "sld_p2"; action: DRAG_VAL_PAGE 1.0 0.0; - target: "slider"; + target: "e.dragable.slider"; } program { name: "sld_down"; signal: "mouse,down,1"; - source: "slider"; + source: "e.dragable.slider"; action: STATE_SET "clicked" 0.0; target: "slider_img"; } program { name: "sld_up"; signal: "mouse,up,1"; - source: "slider"; + source: "e.dragable.slider"; action: STATE_SET "default" 0.0; target: "slider_img"; } program { name: "sld_in"; signal: "mouse,in"; - source: "slider"; + source: "e.dragable.slider"; action: STATE_SET "visible" 0.0; transition: SINUSOIDAL 1.0; target: "slider_glow"; @@ -770,59 +770,59 @@ group { program { name: "sld_out"; signal: "mouse,out"; - source: "slider"; + source: "e.dragable.slider"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 1.0; target: "slider_glow"; } program { name: "focus_in"; - signal: "focus_in"; - source: ""; + signal: "e,state,focused"; + source: "e"; action: STATE_SET "focused" 0.0; transition: DECELERATE 0.2; target: "focus"; } program { name: "focus_out"; - signal: "focus_out"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; action: STATE_SET "default" 0.0; transition: ACCELERATE 0.5; target: "focus"; } program { - name: "show_label"; - signal: "show_label"; - source: ""; + name: "e,action,show,label"; + signal: "e,action,show,label"; + source: "e"; action: STATE_SET "active" 0.0; target: "sld_base"; target: "label_under"; - target: "label"; + target: "e.text.label"; target: "label_over"; } program { - name: "hide_label"; - signal: "hide_label"; - source: ""; + name: "e,action,hide,label"; + signal: "e,action,hide,label"; + source: "e"; action: STATE_SET "default" 0.0; target: "sld_base"; target: "label_under"; - target: "label"; + target: "e.text.label"; target: "label_over"; } program { name: "disable"; - signal: "disabled"; - source: ""; + signal: "e,state,disabled"; + source: "e"; action: STATE_SET "disabled" 0.0; target: "clip"; target: "catch"; } program { name: "enable"; - signal: "enabled"; - source: ""; + signal: "e,state,enabled"; + source: "e"; action: STATE_SET "default" 0.0; target: "clip"; target: "catch"; diff --git a/data/themes/default_spectrum.edc b/data/themes/default_spectrum.edc index 5546ad5032..eca0f1d9ae 100644 --- a/data/themes/default_spectrum.edc +++ b/data/themes/default_spectrum.edc @@ -63,7 +63,7 @@ group { } } part { - name: "cursor"; + name: "e.dragable.cursor"; type: RECT; dragable { confine: "content"; @@ -94,11 +94,11 @@ group { description { state: "default" 0.0; rel1 { - to_x: "cursor"; + to_x: "e.dragable.cursor"; to_y: "content"; } rel2 { - to_x: "cursor"; + to_x: "e.dragable.cursor"; to_y: "content"; } @@ -111,11 +111,11 @@ group { state: "default" 0.0; rel1 { to_x: "content"; - to_y: "cursor"; + to_y: "e.dragable.cursor"; } rel2 { to_x: "content"; - to_y: "cursor"; + to_y: "e.dragable.cursor"; } } diff --git a/data/themes/default_start.edc b/data/themes/default_start.edc index a126b05367..c7fbd8119c 100644 --- a/data/themes/default_start.edc +++ b/data/themes/default_start.edc @@ -378,8 +378,8 @@ group { } program { name: "handle_active"; - signal: "active"; - source: ""; + signal: "e,state,focused"; + source: "e"; script { new val; @@ -392,8 +392,8 @@ group { } program { name: "handle_passive"; - signal: "passive"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; script { new val; diff --git a/data/themes/default_temperature.edc b/data/themes/default_temperature.edc index 2d3349bd8d..fa71187c62 100644 --- a/data/themes/default_temperature.edc +++ b/data/themes/default_temperature.edc @@ -69,7 +69,7 @@ group { } } part { - name: "reading"; + name: "e.text.reading"; type: TEXT; effect: SOFT_SHADOW; clip_to: "fade_clip"; @@ -162,15 +162,15 @@ group { programs { program { name: "known"; - signal: "known"; - source: ""; + signal: "e,state,known"; + source: "e"; action: STATE_SET "default" 0.0; target: "fade_clip"; } program { name: "unknown"; - signal: "unknown"; - source: ""; + signal: "e,state,unknown"; + source: "e"; action: STATE_SET "faded" 0.0; target: "fade_clip"; } diff --git a/data/themes/default_textblock.edc b/data/themes/default_textblock.edc index d2c1a1ab34..93764e441a 100644 --- a/data/themes/default_textblock.edc +++ b/data/themes/default_textblock.edc @@ -15,7 +15,7 @@ group { name: "widgets/textblock"; parts { part { - name: "text"; + name: "e.textblock.text"; type: TEXTBLOCK; mouse_events: 0; description { diff --git a/data/themes/default_theme_about.edc b/data/themes/default_theme_about.edc index 3db957906e..28cec80aa9 100644 --- a/data/themes/default_theme_about.edc +++ b/data/themes/default_theme_about.edc @@ -323,7 +323,7 @@ group { name: "button_unclick2"; signal: "mouse,clicked,1"; source: "button"; - action: SIGNAL_EMIT "close" ""; + action: SIGNAL_EMIT "e,action,close" ""; } program { diff --git a/data/themes/default_tlist.edc b/data/themes/default_tlist.edc index e3b24b785e..085be89ac5 100644 --- a/data/themes/default_tlist.edc +++ b/data/themes/default_tlist.edc @@ -152,7 +152,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -181,7 +181,7 @@ group { } } part { - name: "labelblock"; + name: "e.textblock.label"; type: TEXTBLOCK; effect: SHADOW; mouse_events: 0; @@ -383,8 +383,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -458,8 +458,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -625,7 +625,7 @@ group { } } part { - name: "label"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -654,7 +654,7 @@ group { } } part { - name: "labelblock"; + name: "e.textblock.label"; type: TEXTBLOCK; effect: SHADOW; mouse_events: 0; @@ -856,8 +856,8 @@ group { programs { program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_bar"; target: "title_shadow1"; @@ -931,8 +931,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_bar"; target: "title_shadow1"; diff --git a/data/themes/default_transitions.edc b/data/themes/default_transitions.edc index 5134691735..e3c47c29d0 100644 --- a/data/themes/default_transitions.edc +++ b/data/themes/default_transitions.edc @@ -6,7 +6,7 @@ group { name: "transitions/crossfade"; parts { part { - name: "bg_prev"; + name: "e.swallow.bg.old"; type: SWALLOW; mouse_events: 0; description { @@ -14,7 +14,7 @@ group { } } part { - name: "bg_new"; + name: "e.swallow.bg.new"; type: SWALLOW; clip_to: "bg_new_clip"; mouse_events: 0; @@ -40,8 +40,8 @@ group { programs { program { name: "go"; - signal: "go"; - source: ""; + signal: "e,action,start"; + source: "e"; action: STATE_SET "done" 0.0; transition: SINUSOIDAL 1.0; target: "bg_new_clip"; @@ -49,7 +49,7 @@ group { } program { name: "go2"; - action: SIGNAL_EMIT "done" ""; + action: SIGNAL_EMIT "e,state,done" ""; } } } @@ -58,7 +58,7 @@ group { name: "transitions/vswipe"; parts { part { - name: "bg_prev"; + name: "e.swallow.bg.old"; type: SWALLOW; clip_to: "bg_prev_clip"; mouse_events: 0; @@ -67,7 +67,7 @@ group { } } part { - name: "bg_new"; + name: "e.swallow.bg.new"; type: SWALLOW; clip_to: "bg_new_clip"; mouse_events: 0; @@ -157,8 +157,8 @@ group { programs { program { name: "go"; - signal: "go"; - source: ""; + signal: "e,action,start"; + source: "e"; action: STATE_SET "done" 0.0; transition: SINUSOIDAL 1.0; target: "bg_new_clip"; @@ -167,7 +167,7 @@ group { } program { name: "go2"; - action: SIGNAL_EMIT "done" ""; + action: SIGNAL_EMIT "e,state,done" ""; } } } diff --git a/data/themes/default_winlist.edc b/data/themes/default_winlist.edc index e489094349..11b100b84e 100644 --- a/data/themes/default_winlist.edc +++ b/data/themes/default_winlist.edc @@ -78,7 +78,7 @@ group { } } part { - name: "list_swallow"; + name: "e.swallow.list"; type: SWALLOW; clip_to: "list_clip"; description { @@ -87,12 +87,12 @@ group { rel1 { relative: 0.0 1.0; offset: 16 16; - to_y: "title"; + to_y: "e.text.title"; } rel2 { relative: 1.0 0.0; offset: -17 -17; - to_y: "icon_swallow"; + to_y: "e.swallow.icon"; } } } @@ -105,12 +105,12 @@ group { rel1 { relative: 0.0 0.0; offset: 0 0; - to_y: "list_swallow"; + to_y: "e.swallow.list"; } rel2 { relative: 1.0 1.0; offset: -1 -1; - to_y: "list_swallow"; + to_y: "e.swallow.list"; } } } @@ -126,7 +126,7 @@ group { rel2 { relative: 1.0 0.0; offset: -2 16; - to_y: "list_swallow"; + to_y: "e.swallow.list"; } image { normal: "e17_winlist_top.png"; @@ -145,7 +145,7 @@ group { rel1 { relative: 0.0 1.0; offset: 1 -3; - to_y: "list_swallow"; + to_y: "e.swallow.list"; } rel2 { relative: 1.0 1.0; @@ -161,7 +161,7 @@ group { } } part { - name: "title"; + name: "e.text.title"; type: TEXT; effect: SOFT_SHADOW; mouse_events: 0; @@ -209,7 +209,7 @@ group { } } part { - name: "title_text"; + name: "e.text.label"; type: TEXT; effect: SOFT_SHADOW; mouse_events: 0; @@ -246,12 +246,12 @@ group { rel1 { relative: 0.0 0.0; offset: 16 -7; - to_y: "title_text"; + to_y: "e.text.label"; } rel2 { relative: 1.0 1.0; offset: -17 6; - to_y: "title_text"; + to_y: "e.text.label"; } image { normal: "e17_ibar_over_h.png"; @@ -264,7 +264,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; description { state: "default" 0.0; @@ -292,12 +292,12 @@ group { description { state: "default" 0.0; rel1 { - to: "icon_swallow"; + to: "e.swallow.icon"; relative: 0.0 0.0; offset: -8 -8; } rel2 { - to: "icon_swallow"; + to: "e.swallow.icon"; relative: 1.0 1.0; offset: 7 7; } @@ -324,7 +324,7 @@ group { rel1 { relative: 1.0 0.0; offset: 1 -1; - to_x: "icon_swallow"; + to_x: "e.swallow.icon"; } rel2 { relative: 0.0 1.0; @@ -503,15 +503,15 @@ group { offset: 0 6; } text { - text_source: "title_text"; - source: "title_text"; + text_source: "e.text.label"; + source: "e.text.label"; min: 0 1; text_class: "title_bar"; } } } part { - name: "title_text"; + name: "e.text.label"; type: TEXT; effect: SHADOW; mouse_events: 0; @@ -520,7 +520,7 @@ group { rel1 { relative: 1.0 0.0; offset: 9 6; - to_x: "icon_swallow"; + to_x: "e.swallow.icon"; } rel2 { relative: 0.0 1.0; @@ -706,7 +706,7 @@ group { } } part { - name: "icon_swallow"; + name: "e.swallow.icon"; type: SWALLOW; description { state: "default" 0.0; @@ -772,29 +772,29 @@ group { programs { program { name: "type1"; - signal: "iconified"; - source: ""; + signal: "e,state,iconified"; + source: "e"; action: STATE_SET "iconified" 0.0; target: "type"; } program { name: "type2"; - signal: "invisible"; - source: ""; + signal: "e,state,invisible"; + source: "e"; action: STATE_SET "invisible" 0.0; target: "type"; } program { name: "type3"; - signal: "shaded"; - source: ""; + signal: "e,state,shaded"; + source: "e"; action: STATE_SET "shaded" 0.0; target: "type"; } program { name: "go_active_pre"; - signal: "active"; - source: ""; + signal: "e,state,selected"; + source: "e"; action: STATE_SET "default" 0.0; target: "title_outline"; target: "title_bar"; @@ -870,8 +870,8 @@ group { program { name: "go_passive_pre"; - signal: "passive"; - source: ""; + signal: "e,state,unselected"; + source: "e"; action: STATE_SET "active" 0.0; target: "title_outline"; target: "title_bar"; |
