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

17 years ago · a5c71890d4
parent 49c524e4c7
commit a5c71890d4
88 changed files with 1356 additions and 1201 deletions
--- a/data/images/e.png
+++ b/data/images/e.png
--- 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 {      
--- 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";
      }
--- 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;
--- 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"; 
     }
   }
 }
--- 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";
      }
   }
 }
--- 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" "";
    } 
  }
 }
--- 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");
 	 }
--- 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";
      }
--- 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;
        }