diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc index 9853358e67..dce7b4f0e2 100644 --- a/data/elementary/themes/edc/efl/button.edc +++ b/data/elementary/themes/edc/efl/button.edc @@ -298,7 +298,7 @@ group { name: "efl/button"; programs { program { signal: "mouse,down,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,press" "elm"; + action: SIGNAL_EMIT "action,press" "efl"; after: "button_click_anim"; } program { name: "button_click_anim"; @@ -310,7 +310,7 @@ group { name: "efl/button"; } program { name: "button_unclick"; signal: "mouse,up,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,unpress" "elm"; + action: SIGNAL_EMIT "action,unpress" "efl"; after: "button_unclick_anim"; } program { name: "button_unclick_anim"; @@ -321,7 +321,7 @@ group { name: "efl/button"; } } program { name: "buttonactivate"; - signal: "elm,anim,activate"; source: "elm"; + signal: "anim,activate"; source: "efl"; action: STATE_SET "pressed" 0.0; target: "base"; after: "button_unpressed_anim"; @@ -333,10 +333,10 @@ group { name: "efl/button"; } program { signal: "mouse,clicked,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,click" "elm"; + action: SIGNAL_EMIT "action,click" "efl"; } program { name: "button_text_visible"; - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,text,set"; source: "efl"; script { new m = get_int(btmode); m |= LABEL; set_int(btmode, m); @@ -344,7 +344,7 @@ group { name: "efl/button"; } } program { name: "button_text_hidden"; - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,text,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~LABEL; set_int(btmode, m); @@ -352,7 +352,7 @@ group { name: "efl/button"; } } program { name: "button_icon_visible"; - signal: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; script { new m = get_int(btmode); m |= ICON; set_int(btmode, m); @@ -360,7 +360,7 @@ group { name: "efl/button"; } } program { name: "button_icon_hidden"; - signal: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~ICON; set_int(btmode, m); @@ -368,7 +368,7 @@ group { name: "efl/button"; } } program { name: "button_background_visible"; - signal: "elm,state,background,set"; source: "elm"; + signal: "state,background,set"; source: "efl"; script { new m = get_int(btmode); m |= BACKGROUND; set_int(btmode, m); @@ -376,7 +376,7 @@ group { name: "efl/button"; } } program { name: "button_background_hidden"; - signal: "elm,state,background,unset"; source: "elm"; + signal: "state,background,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~BACKGROUND; set_int(btmode, m); @@ -384,7 +384,7 @@ group { name: "efl/button"; } } program { name: "button_state_disabled"; - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(btmode); m |= DISABLE; set_int(btmode, m); @@ -392,7 +392,7 @@ group { name: "efl/button"; } } program { name: "button_state_enabled"; - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(btmode); m &= ~DISABLE; set_int(btmode, m); @@ -682,7 +682,7 @@ group { name: "efl/button:anchor"; programs { program { signal: "mouse,down,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,press" "elm"; + action: SIGNAL_EMIT "action,press" "efl"; after: "button_click_anim"; } program { name: "button_click_anim"; @@ -692,7 +692,7 @@ group { name: "efl/button:anchor"; } program { signal: "mouse,up,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,unpress" "elm"; + action: SIGNAL_EMIT "action,unpress" "efl"; after: "button_unclick_anim"; } program { name: "button_unclick_anim"; @@ -701,7 +701,7 @@ group { name: "efl/button:anchor"; target: "text2"; } program { - signal: "elm,anim,activate"; source: "elm"; + signal: "anim,activate"; source: "efl"; action: STATE_SET "clicked" 0.0; target: "bar2"; target: "text2"; @@ -715,10 +715,10 @@ group { name: "efl/button:anchor"; } program { signal: "mouse,clicked,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,click" "elm"; + action: SIGNAL_EMIT "action,click" "efl"; } program { name: "button_text_visible"; - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,text,set"; source: "efl"; script { new m = get_int(btmode); m |= LABEL; set_int(btmode, m); @@ -726,7 +726,7 @@ group { name: "efl/button:anchor"; } } program { name: "button_text_hidden"; - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,text,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~LABEL; set_int(btmode, m); @@ -734,7 +734,7 @@ group { name: "efl/button:anchor"; } } program { name: "button_icon_visible"; - signal: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; script { new m = get_int(btmode); m |= ICON; set_int(btmode, m); @@ -742,7 +742,7 @@ group { name: "efl/button:anchor"; } } program { name: "button_icon_hidden"; - signal: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~ICON; set_int(btmode, m); @@ -750,17 +750,17 @@ group { name: "efl/button:anchor"; } } program { name: "button_background_visible"; - signal: "elm,state,background,set"; source: "elm"; + signal: "state,background,set"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.swallow.background"; } program { name: "button_background_hidden"; - signal: "elm,state,background,unset"; source: "elm"; + signal: "state,background,unset"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.swallow.background"; } program { name: "button_state_disabled"; - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(btmode); m |= DISABLE; set_int(btmode, m); @@ -768,7 +768,7 @@ group { name: "efl/button:anchor"; } } program { name: "button_state_enabled"; - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(btmode); m &= ~DISABLE; set_int(btmode, m); diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc index 2fd7e95233..4f8313e14b 100644 --- a/data/elementary/themes/edc/efl/calendar.edc +++ b/data/elementary/themes/edc/efl/calendar.edc @@ -41,7 +41,7 @@ color: 0 0 0 0;\ }\ }\ - part { name: "elm,calendar,button"#_sufix",left";\ + part { name: "calendar,button"#_sufix",left";\ type: SWALLOW;\ scale: 1;\ description { state: "default" 0.0;\ @@ -55,7 +55,7 @@ rel2.to: "right_bt"#_sufix;\ }\ }\ - part { name: "elm,calendar,button"#_sufix",right";\ + part { name: "calendar,button"#_sufix",right";\ type: SWALLOW;\ scale: 1;\ description { state: "default" 0.0;\ @@ -260,7 +260,7 @@ program { \ name: "cit_"#_pos".go_active"; \ signal: "cit_"#_pos",selected"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "selected" 0.0; \ target: "cit_"#_pos".pat"; \ target: "cit_"#_pos".selected"; \ @@ -268,7 +268,7 @@ program { \ name: "cit_"#_pos".go_passive"; \ signal: "cit_"#_pos",unselected"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "default" 0.0; \ target: "cit_"#_pos".pat"; \ target: "cit_"#_pos".selected"; \ @@ -276,7 +276,7 @@ program { \ name: "cit_"#_pos".focus_highlighted"; \ signal: "cit_"#_pos",focused"; \ - source: "elm"; \ + source: "efl"; \ script { \ set_int(item_focus_enabled, 1); \ set_int(last_focused_item, _pos); \ @@ -287,7 +287,7 @@ program { \ name: "cit_"#_pos".focus_unhighlighed"; \ signal: "cit_"#_pos",unfocused"; \ - source: "elm"; \ + source: "efl"; \ script { \ set_int(item_focus_enabled, 0); \ set_state(PART:"cit_"#_pos".glow", "default", 0.0); \ @@ -296,21 +296,21 @@ program { \ name: "cit_"#_pos".is_today"; \ signal: "cit_"#_pos",today"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "today" 0.0; \ target: "cit_"#_pos".text"; \ } \ program { \ name: "cit_"#_pos".not_today"; \ signal: "cit_"#_pos",not_today"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "default" 0.0; \ target: "cit_"#_pos".text"; \ } \ program { \ name: "cit_"#_pos".enable"; \ signal: "cit_"#_pos",enable"; \ - source: "elm"; \ + source: "efl"; \ script { \ new st[31]; \ new Float:vl; \ @@ -322,7 +322,7 @@ program { \ name: "cit_"#_pos".disable"; \ signal: "cit_"#_pos",disable"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "disabled" 0.0; \ target: "cit_"#_pos".text"; \ } \ @@ -344,12 +344,12 @@ source: "cit_"#_pos".clicked"; \ signal: "mouse,clicked,1"; \ source: "cit_"#_pos".event"; \ - action: SIGNAL_EMIT "elm,action,selected" #_pos; \ + action: SIGNAL_EMIT "action,selected" #_pos; \ } \ program { \ name: "cit_"#_pos".clear"; \ signal: "cit_"#_pos",clear"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "default" 0.0; \ target: "cit_"#_pos".check"; \ after: "cit_"#_pos".weekends_clear"; \ @@ -378,14 +378,14 @@ program { \ name: "cit_"#_pos".checked"; \ signal: "cit_"#_pos",checked"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "visible" 0.0; \ target: "cit_"#_pos".check"; \ } \ program { \ name: "cit_"#_pos".holiday"; \ signal: "cit_"#_pos",holiday"; \ - source: "elm"; \ + source: "efl"; \ script { \ new st[31]; \ new Float:vl; \ @@ -397,7 +397,7 @@ program { \ name: "cit_"#_pos".weekend/day1"; \ signal: "cit_"#_pos",weekend/day1"; \ - source: "elm"; \ + source: "efl"; \ script { \ new st[31]; \ new Float:vl; \ @@ -409,7 +409,7 @@ program { \ name: "cit_"#_pos".weekend/day2"; \ signal: "cit_"#_pos",weekend/day2"; \ - source: "elm"; \ + source: "efl"; \ script { \ new st[31]; \ new Float:vl; \ @@ -516,20 +516,20 @@ group { "efl/calendar"; } programs { program { - signal: "elm,action,focus_highlight,show"; - source: "elm"; + signal: "action,focus_highlight,show"; + source: "efl"; script { set_int(win_focus_enabled, 1); if (get_int(item_focus_enabled) == 1) { new value[32]; snprintf(value, 32, "cit_%d,focused", get_int(last_focused_item)); - emit(value, "elm"); + emit(value, "efl"); } } } program { - signal: "elm,action,focus_highlight,hide"; - source: "elm"; + signal: "action,focus_highlight,hide"; + source: "efl"; script { set_int(win_focus_enabled, 0); } @@ -599,7 +599,7 @@ group { "efl/calendar"; } } program { name: "button_press2"; - action: SIGNAL_EMIT "elm,action,press" ""; + action: SIGNAL_EMIT "action,press" ""; after: "button_press_anim"; } program { name: "button_press_anim"; @@ -618,7 +618,7 @@ group { "efl/calendar"; } } program { name: "button_unpress2"; - action: SIGNAL_EMIT "elm,action,unpress" ""; + action: SIGNAL_EMIT "action,unpress" ""; } program { name: "button_unpress_anim"; action: STATE_SET "default" 0.0; @@ -634,21 +634,21 @@ group { "efl/calendar"; } } program { name: "action_unpressed"; - signal: "elm,action,unpressed"; - source: "elm"; + signal: "action,unpressed"; + source: "efl"; after: "button_unpress_anim"; } program { name: "action_pressed"; - signal: "elm,action,pressed"; - source: "elm"; + signal: "action,pressed"; + source: "efl"; after: "button_press_anim"; } program { name: "button_click2"; - action: SIGNAL_EMIT "elm,action,click" ""; + action: SIGNAL_EMIT "action,click" ""; } program { name: "access_pressed"; - signal: "elm,action,anim,activate"; - source: "elm"; + signal: "action,anim,activate"; + source: "efl"; action: STATE_SET "pressed" 0.0; target: "arrow.image"; after: "access_pressed_anim"; @@ -659,31 +659,31 @@ group { "efl/calendar"; target: "arrow.image"; } program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; + signal: "state,disabled"; + source: "efl"; action: STATE_SET "disabled" 0.0; target: "arrow.image"; target: "disabler"; } program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; + signal: "state,enabled"; + source: "efl"; action: STATE_SET "default" 0.0; target: "arrow.image"; target: "disabler"; } program { name: "multi_down"; - signal: "elm,action,multi,down"; - source: "elm"; + signal: "action,multi,down"; + source: "efl"; script { set_int(multi_down, 1); } } program { name: "multi_up"; - signal: "elm,action,multi,up"; - source: "elm"; + signal: "action,multi,up"; + source: "efl"; script { set_int(multi_down, 0); } diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc index 6bcc5cfa78..31ffafdc38 100644 --- a/data/elementary/themes/edc/efl/check.edc +++ b/data/elementary/themes/edc/efl/check.edc @@ -258,20 +258,20 @@ group { "efl/check"; programs { program { signal: "mouse,clicked,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,check,toggle" "elm"; + action: SIGNAL_EMIT "action,check,toggle" "efl"; } program { - signal: "elm,state,check,on"; source: "elm"; + signal: "state,check,on"; source: "efl"; action: STATE_SET "selected" 0.0; target: "indicator"; } program { - signal: "elm,state,check,off"; source: "elm"; + signal: "state,check,off"; source: "efl"; action: STATE_SET "default" 0.0; target: "indicator"; } program { - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,elm.text,set"; source: "efl"; script { new m = get_int(btmode); m |= LABEL; set_int(btmode, m); @@ -279,7 +279,7 @@ group { "efl/check"; } } program { - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,elm.text,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~LABEL; set_int(btmode, m); @@ -287,7 +287,7 @@ group { "efl/check"; } } program { - signal: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; script { new m = get_int(btmode); m |= ICON; set_int(btmode, m); @@ -295,7 +295,7 @@ group { "efl/check"; } } program { - signal: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~ICON; set_int(btmode, m); @@ -303,7 +303,7 @@ group { "efl/check"; } } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(btmode); m |= DISABLE; set_int(btmode, m); @@ -311,7 +311,7 @@ group { "efl/check"; } } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(btmode); m &= ~DISABLE; set_int(btmode, m); @@ -776,10 +776,10 @@ group { "efl/check:toggle"; programs { program { signal: "mouse,clicked,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,check,toggle" "elm"; + action: SIGNAL_EMIT "action,check,toggle" "efl"; } program { - signal: "elm,state,check,on"; source: "elm"; + signal: "state,check,on"; source: "efl"; script { new Float:drag; if (get_int(is_rtl) == 0) { @@ -791,7 +791,7 @@ group { "efl/check:toggle"; } } program { - signal: "elm,state,check,off"; source: "elm"; + signal: "state,check,off"; source: "efl"; script { new Float:drag; if (get_int(is_rtl) == 0) { @@ -815,9 +815,9 @@ group { "efl/check:toggle"; } if (((get_int(is_rtl) == 1) && (dx <= 0.5)) || (get_int(is_rtl) == 0) && (dx > 0.5)) { - emit("elm,action,check,off", "elm"); + emit("action,check,off", "efl"); } else { - emit("elm,action,check,on", "elm"); + emit("action,check,on", "efl"); } } } @@ -848,9 +848,9 @@ group { "efl/check:toggle"; } if (((get_int(is_rtl) == 1) && (dx <= 0.5)) || (get_int(is_rtl) == 0) && (dx > 0.5)) { - emit("elm,action,check,on", "elm"); + emit("action,check,on", "efl"); } else { - emit("elm,action,check,off", "elm"); + emit("action,check,off", "efl"); } set_int(was_drag, 1); set_int(is_drag, 0); @@ -870,7 +870,7 @@ group { "efl/check:toggle"; target: "glow_but"; } program { - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,elm.text,set"; source: "efl"; script { new m = get_int(btmode); m |= LABEL; set_int(btmode, m); @@ -878,7 +878,7 @@ group { "efl/check:toggle"; } } program { - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,elm.text,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~LABEL; set_int(btmode, m); @@ -886,7 +886,7 @@ group { "efl/check:toggle"; } } program { - signal: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; script { new m = get_int(btmode); m |= ICON; set_int(btmode, m); @@ -894,7 +894,7 @@ group { "efl/check:toggle"; } } program { - signal: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~ICON; set_int(btmode, m); @@ -902,7 +902,7 @@ group { "efl/check:toggle"; } } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(btmode); m |= DISABLE; set_int(btmode, m); @@ -910,7 +910,7 @@ group { "efl/check:toggle"; } } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(btmode); m &= ~DISABLE; set_int(btmode, m); diff --git a/data/elementary/themes/edc/efl/focus.edc b/data/elementary/themes/edc/efl/focus.edc index 426f869399..dc0b6928e5 100644 --- a/data/elementary/themes/edc/efl/focus.edc +++ b/data/elementary/themes/edc/efl/focus.edc @@ -118,7 +118,7 @@ group { name: "efl/focus_highlight/top"; } programs { program { - signal: "elm,action,focus,show"; source: "elm"; + signal: "action,focus,show"; source: "efl"; action: ACTION_STOP; target: "pulse"; target: "pulse2"; @@ -132,17 +132,17 @@ group { name: "efl/focus_highlight/top"; after: "go3"; } program { name: "go3"; - action: SIGNAL_EMIT "elm,action,focus,show,end" "elm"; + action: SIGNAL_EMIT "action,focus,show,end" "efl"; } program { - signal: "elm,action,focus,hide"; source: "elm"; + signal: "action,focus,hide"; source: "efl"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.4; target: "clip"; after: "stop2"; } program { name: "stop2"; - action: SIGNAL_EMIT "elm,action,focus,hide,end" "elm"; + action: SIGNAL_EMIT "action,focus,hide,end" "efl"; after: "stop3"; } program { name: "stop3"; @@ -164,7 +164,7 @@ group { name: "efl/focus_highlight/top"; after: "pulse"; } program { - signal: "elm,state,anim,stop"; source: "elm"; + signal: "state,anim,stop"; source: "efl"; action: STATE_SET "default" 0.0; target: "base"; } diff --git a/data/elementary/themes/edc/efl/frame.edc b/data/elementary/themes/edc/efl/frame.edc index 729177ad98..e225952b10 100644 --- a/data/elementary/themes/edc/efl/frame.edc +++ b/data/elementary/themes/edc/efl/frame.edc @@ -133,10 +133,10 @@ group { name: "efl/frame"; } program { signal: "mouse,up,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,click" "elm"; + action: SIGNAL_EMIT "action,click" "efl"; } program { - signal: "elm,action,toggle"; source: "elm"; + signal: "action,toggle"; source: "efl"; script { new st[31]; new Float:vl; @@ -148,7 +148,7 @@ group { name: "efl/frame"; } } program { - signal: "elm,action,switch"; source: "elm"; + signal: "action,switch"; source: "efl"; script { new st[31]; new Float:vl; @@ -160,7 +160,7 @@ group { name: "efl/frame"; } } program { name: "signal"; - action: SIGNAL_EMIT "elm,anim,done" "elm"; + action: SIGNAL_EMIT "anim,done" "efl"; } } } \ No newline at end of file diff --git a/data/elementary/themes/edc/efl/list.edc b/data/elementary/themes/edc/efl/list.edc index 4b309c8ce5..25026270f6 100644 --- a/data/elementary/themes/edc/efl/list.edc +++ b/data/elementary/themes/edc/efl/list.edc @@ -31,12 +31,12 @@ group { name: "efl/list/item"; } } program { - signal: "elm,state,odd"; source: "elm"; + signal: "state,odd"; source: "efl"; action: STATE_SET "odd" 1.0; target: "base"; } program { - signal: "elm,state,even"; source: "elm"; + signal: "state,even"; source: "efl"; action: STATE_SET "default" 0.0; target: "base"; } @@ -88,26 +88,26 @@ group { name: "efl/list/item"; } } program { - signal: "elm,state,selected"; source: "elm"; + signal: "state,selected"; source: "efl"; action: STATE_SET "selected" 0.0; target: "sel_shadow"; target: "sel_base"; target: "sel_bevel"; } program { - signal: "elm,state,unselected"; source: "elm"; + signal: "state,unselected"; source: "efl"; action: STATE_SET "default" 0.0; target: "sel_shadow"; target: "sel_base"; target: "sel_bevel"; } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "event"; } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; action: STATE_SET "default" 0.0; target: "event"; } @@ -192,28 +192,28 @@ group { name: "efl/list/item"; } } program { - signal: "elm,state,selected"; source: "elm"; + signal: "state,selected"; source: "efl"; action: STATE_SET "selected" 0.0; target: "elm.text"; target: "label2"; target: "label3"; } program { - signal: "elm,state,unselected"; source: "elm"; + signal: "state,unselected"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.text"; target: "label2"; target: "label3"; } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "elm.text"; target: "label2"; target: "label3"; } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.text"; target: "label2"; @@ -269,22 +269,22 @@ group { name: "efl/list/item"; } } program { - signal: "elm,state,selected"; source: "elm"; + signal: "state,selected"; source: "efl"; action: STATE_SET "selected" 0.0; target: "sel_shine"; } program { - signal: "elm,state,unselected"; source: "elm"; + signal: "state,unselected"; source: "efl"; action: STATE_SET "default" 0.0; target: "sel_shine"; } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "event_block"; } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; action: STATE_SET "default" 0.0; target: "event_block"; } diff --git a/data/elementary/themes/edc/efl/multibuttonentry.edc b/data/elementary/themes/edc/efl/multibuttonentry.edc index 5996a6c8a0..1e73784f1e 100644 --- a/data/elementary/themes/edc/efl/multibuttonentry.edc +++ b/data/elementary/themes/edc/efl/multibuttonentry.edc @@ -226,28 +226,28 @@ group { "efl/multibuttonentry/btn"; } } program { - signal: "elm,state,default"; - source: "elm"; + signal: "state,default"; + source: "efl"; action: STATE_SET "default"; target: "glow"; } program { - signal: "elm,state,focused"; - source: "elm"; + signal: "state,focused"; + source: "efl"; action: STATE_SET "focused"; target: "glow"; } program { - signal: "elm,state,enabled"; - source: "elm"; + signal: "state,enabled"; + source: "efl"; script { set_state(PART:"text", "default", 0.0); set_int(disabled , 0); } } program { - signal: "elm,state,disabled"; - source: "elm"; + signal: "state,disabled"; + source: "efl"; script { new st[31]; new Float: vl; @@ -259,8 +259,8 @@ group { "efl/multibuttonentry/btn"; } } program { - signal: "elm,state,unfocused"; - source: "elm"; + signal: "state,unfocused"; + source: "efl"; action: STATE_SET "unfocused"; target: "glow"; } @@ -289,7 +289,7 @@ group { "efl/multibuttonentry/btn"; program { signal: "mouse,clicked,1"; source: "del"; - action: SIGNAL_EMIT "elm,deleted" "elm"; + action: SIGNAL_EMIT "deleted" "efl"; } program { signal: "mouse,down,1"; diff --git a/data/elementary/themes/edc/efl/nstate.edc b/data/elementary/themes/edc/efl/nstate.edc index c63624deec..892dc8cbc3 100644 --- a/data/elementary/themes/edc/efl/nstate.edc +++ b/data/elementary/themes/edc/efl/nstate.edc @@ -3,7 +3,7 @@ group { "efl/nstate"; programs { program { signal: "mouse,clicked,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,state,changed" "elm"; + action: SIGNAL_EMIT "action,state,changed" "efl"; } } } diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc index 0ce77383f7..0ba38e6887 100644 --- a/data/elementary/themes/edc/efl/panes.edc +++ b/data/elementary/themes/edc/efl/panes.edc @@ -1,14 +1,14 @@ /* panes widget style information [SIGNAL] - elm,panes,fixed: Used for elm_panes_fixed_set() - elm,panes,unfixed: Used for elm_panes_fixed_set() + panes,fixed: Used for elm_panes_fixed_set() + panes,unfixed: Used for elm_panes_fixed_set() [SIGNAL EMIT] - elm,action,click: Used for "clicked" smart callback. - elm,action,click,double: Used for "clicked,double" smart callback. - elm,action,press: Used for "press" smart callback. - elm,action,unpress: Used for "unpress" smart callback. + action,click: Used for "clicked" smart callback. + action,click,double: Used for "clicked,double" smart callback. + action,press: Used for "press" smart callback. + action,unpress: Used for "unpress" smart callback. */ #define PANEMIN 10 @@ -130,24 +130,24 @@ group { name: "efl/panes/vertical"; } programs { program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback - action: SIGNAL_EMIT "elm,action,press" "elm"; + action: SIGNAL_EMIT "action,press" "efl"; } program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback - action: SIGNAL_EMIT "elm,action,unpress" "elm"; + action: SIGNAL_EMIT "action,unpress" "efl"; } program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback - action: SIGNAL_EMIT "elm,action,click" "elm"; + action: SIGNAL_EMIT "action,click" "efl"; } program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback - action: SIGNAL_EMIT "elm,action,click,double" "elm"; + action: SIGNAL_EMIT "action,click,double" "efl"; } program { // for elm_panes_fixed_set() - signal: "elm,panes,fixed"; source: "elm"; + signal: "panes,fixed"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "bar"; } program { // for elm_panes_fixed_set() - signal: "elm,panes,unfixed"; source: "elm"; + signal: "panes,unfixed"; source: "efl"; action: STATE_SET "default" 0.0; target: "bar"; } @@ -269,24 +269,24 @@ group { name: "efl/panes/horizontal"; } programs { program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback - action: SIGNAL_EMIT "elm,action,press" "elm"; + action: SIGNAL_EMIT "action,press" "efl"; } program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback - action: SIGNAL_EMIT "elm,action,unpress" "elm"; + action: SIGNAL_EMIT "action,unpress" "efl"; } program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback - action: SIGNAL_EMIT "elm,action,click" "elm"; + action: SIGNAL_EMIT "action,click" "efl"; } program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback - action: SIGNAL_EMIT "elm,action,click,double" "elm"; + action: SIGNAL_EMIT "action,click,double" "efl"; } program { // for elm_panes_fixed_set() - signal: "elm,panes,fixed"; source: "elm"; + signal: "panes,fixed"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "bar"; } program { // for elm_panes_fixed_set() - signal: "elm,panes,unfixed"; source: "elm"; + signal: "panes,unfixed"; source: "efl"; action: STATE_SET "default" 0.0; target: "bar"; } @@ -469,24 +469,24 @@ group { name: "efl/panes/vertical:flush"; } programs { program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback - action: SIGNAL_EMIT "elm,action,press" "elm"; + action: SIGNAL_EMIT "action,press" "efl"; } program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback - action: SIGNAL_EMIT "elm,action,unpress" "elm"; + action: SIGNAL_EMIT "action,unpress" "efl"; } program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback - action: SIGNAL_EMIT "elm,action,click" "elm"; + action: SIGNAL_EMIT "action,click" "efl"; } program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback - action: SIGNAL_EMIT "elm,action,click,double" "elm"; + action: SIGNAL_EMIT "action,click,double" "efl"; } program { // for elm_panes_fixed_set() - signal: "elm,panes,fixed"; source: "elm"; + signal: "panes,fixed"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "bar"; } program { // for elm_panes_fixed_set() - signal: "elm,panes,unfixed"; source: "elm"; + signal: "panes,unfixed"; source: "efl"; action: STATE_SET "default" 0.0; target: "bar"; } @@ -725,24 +725,24 @@ group { name: "efl/panes/horizontal:flush"; target: "glow2b"; } program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback - action: SIGNAL_EMIT "elm,action,press" "elm"; + action: SIGNAL_EMIT "action,press" "efl"; } program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback - action: SIGNAL_EMIT "elm,action,unpress" "elm"; + action: SIGNAL_EMIT "action,unpress" "efl"; } program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback - action: SIGNAL_EMIT "elm,action,click" "elm"; + action: SIGNAL_EMIT "action,click" "efl"; } program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback - action: SIGNAL_EMIT "elm,action,click,double" "elm"; + action: SIGNAL_EMIT "action,click,double" "efl"; } program { // for elm_panes_fixed_set() - signal: "elm,panes,fixed"; source: "elm"; + signal: "panes,fixed"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "bar"; } program { // for elm_panes_fixed_set() - signal: "elm,panes,unfixed"; source: "elm"; + signal: "panes,unfixed"; source: "efl"; action: STATE_SET "default" 0.0; target: "bar"; } diff --git a/data/elementary/themes/edc/efl/photocam.edc b/data/elementary/themes/edc/efl/photocam.edc index df5e1e5e51..e2c8f90fe7 100644 --- a/data/elementary/themes/edc/efl/photocam.edc +++ b/data/elementary/themes/edc/efl/photocam.edc @@ -45,7 +45,7 @@ group { name: "efl/photocam"; } programs { program { name: "spin"; - signal: "elm,state,busy,start"; source: "elm"; + signal: "state,busy,start"; source: "efl"; action: ACTION_STOP; target: "spin"; target: "spin0"; @@ -73,14 +73,14 @@ group { name: "efl/photocam"; } program { - signal: "elm,state,busy,start"; source: "elm"; + signal: "state,busy,start"; source: "efl"; action: STATE_SET "active" 0.0; transition: SINUSOIDAL 0.25; target: "busy_clip"; } program { - signal: "elm,state,busy,stop"; source: "elm"; + signal: "state,busy,stop"; source: "efl"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 1.0; target: "busy_clip"; diff --git a/data/elementary/themes/edc/efl/pointer.edc b/data/elementary/themes/edc/efl/pointer.edc index a101aa73c7..92d6517157 100644 --- a/data/elementary/themes/edc/efl/pointer.edc +++ b/data/elementary/themes/edc/efl/pointer.edc @@ -65,7 +65,7 @@ group { name: "efl/pointer"; } programs { program { - signal: "elm,action,mouse,down"; source: "elm"; + signal: "action,mouse,down"; source: "efl"; action: STATE_SET "visible" 0.0; target: "glow"; after: "fade"; @@ -90,7 +90,7 @@ group { name: "efl/pointer"; after: "pulse"; } program { - signal: "elm,action,mouse,move"; source: "elm"; + signal: "action,mouse,move"; source: "efl"; action: STATE_SET "default" 0.0; target: "glow"; after: "stop2"; diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc index 50fb460f09..b73202edd8 100644 --- a/data/elementary/themes/edc/efl/popup.edc +++ b/data/elementary/themes/edc/efl/popup.edc @@ -98,13 +98,13 @@ group { "efl/popup_alert"; } programs { program { - signal: "elm,title,show"; source: "elm"; + signal: "title,show"; source: "efl"; action: STATE_SET "title_visible" 0.0; target: "title_bg"; target: "elm.text.title"; } program { - signal: "elm,buttons,show"; source: "elm"; + signal: "buttons,show"; source: "efl"; action: STATE_SET "button_visible" 0.0; target: "buttons"; } @@ -150,20 +150,20 @@ group { "efl/popup/backwall"; programs { program { - signal: "elm,state,image,visible"; source: "elm"; + signal: "state,image,visible"; source: "efl"; action: STATE_SET "show_image" 0.0; target: "base"; target: "elm.swallow.image"; } program { - signal: "elm,state,image,hidden"; source: "elm"; + signal: "state,image,hidden"; source: "efl"; action: STATE_SET "default" 0.0; target: "base"; target: "elm.swallow.image"; } program { signal: "mouse,clicked,1"; source: "block"; - action: SIGNAL_EMIT "elm,action,clicked" "elm"; + action: SIGNAL_EMIT "action,clicked" "efl"; } } } diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc index 049724207b..6342954f71 100644 --- a/data/elementary/themes/edc/efl/progress.edc +++ b/data/elementary/themes/edc/efl/progress.edc @@ -400,14 +400,14 @@ group { "efl/progressbar/horizontal"; } programs { program { name: "inverted-on"; - signal: "elm,state,inverted,on"; source: "elm"; + signal: "state,inverted,on"; source: "efl"; action: STATE_SET "inv" 0.0; target: "bar"; target: "barend"; target: "light"; } program { name: "inverted-off"; - signal: "elm,state,inverted,off"; source: "elm"; + signal: "state,inverted,off"; source: "efl"; action: STATE_SET "default" 0.0; target: "bar"; target: "barend"; @@ -433,18 +433,18 @@ group { "efl/progressbar/horizontal"; } } program { name: "pulse-mode0"; - signal: "elm,state,pulse"; source: "elm"; + signal: "state,pulse"; source: "efl"; action: STATE_SET "hidden" 0.0; target: "elm.text.status"; after: "pulse-mode1"; } program { name: "pulse-mode1"; - signal: "elm,state,pulse,start"; source: "elm"; + signal: "state,pulse,start"; source: "efl"; action: STATE_SET "pulse" 0.0; target: "fract_clip"; } program { name: "pulse-start"; - signal: "elm,state,pulse,start"; source: "elm"; + signal: "state,pulse,start"; source: "efl"; action: STATE_SET "pulse" 0.0; target: "pulse_clip"; target: "fract_clip"; @@ -477,13 +477,13 @@ group { "efl/progressbar/horizontal"; after: "pulse0.1"; } program { name: "fraction"; - signal: "elm,state,fraction"; source: "elm"; + signal: "state,fraction"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.text.status"; after: "pulse-stop"; } program { name: "elmpulse-stop"; - signal: "elm,state,pulse,stop"; source: "elm"; + signal: "state,pulse,stop"; source: "efl"; action: ACTION_STOP; target: "pulse0"; target: "pulse1"; @@ -494,17 +494,17 @@ group { "efl/progressbar/horizontal"; target: "pulse_clip"; } program { name: "units-visible"; - signal: "elm,state,units,visible"; source: "elm"; + signal: "state,units,visible"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.text.status"; } program { name: "units-hidden"; - signal: "elm,state,units,hidden"; source: "elm"; + signal: "state,units,hidden"; source: "efl"; action: STATE_SET "hidden" 0.0; target: "elm.text.status"; } program { name: "text-visible"; - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,elm.text,set"; source: "efl"; script { new m = get_int(slmode); m |= LABEL; set_int(slmode, m); @@ -512,7 +512,7 @@ group { "efl/progressbar/horizontal"; } } program { name: "text-hidden"; - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,elm.text,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~LABEL; set_int(slmode, m); @@ -520,7 +520,7 @@ group { "efl/progressbar/horizontal"; } } program { name: "icon-visible"; - signal: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; script { new m = get_int(slmode); m |= ICON; set_int(slmode, m); @@ -528,7 +528,7 @@ group { "efl/progressbar/horizontal"; } } program { name: "icon-hidden"; - signal: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~ICON; set_int(slmode, m); @@ -536,7 +536,7 @@ group { "efl/progressbar/horizontal"; } } program { name: "state-disabled"; - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(slmode); m |= DISABLE; set_int(slmode, m); @@ -544,7 +544,7 @@ group { "efl/progressbar/horizontal"; } } program { name: "state-enabled"; - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(slmode); m &= ~DISABLE; set_int(slmode, m); @@ -973,14 +973,14 @@ group { "efl/progressbar/vertical"; } programs { program { name: "inverted-on"; - signal: "elm,state,inverted,on"; source: "elm"; + signal: "state,inverted,on"; source: "efl"; action: STATE_SET "inv" 0.0; target: "bar"; target: "barend"; target: "light"; } program { name: "inverted-off"; - signal: "elm,state,inverted,off"; source: "elm"; + signal: "state,inverted,off"; source: "efl"; action: STATE_SET "default" 0.0; target: "bar"; target: "barend"; @@ -1006,18 +1006,18 @@ group { "efl/progressbar/vertical"; } } program { name: "pulse-mode0"; - signal: "elm,state,pulse"; source: "elm"; + signal: "state,pulse"; source: "efl"; action: STATE_SET "hidden" 0.0; target: "elm.text.status"; after: "pulse-mode1"; } program { name: "pulse-mode1"; - signal: "elm,state,pulse,start"; source: "elm"; + signal: "state,pulse,start"; source: "efl"; action: STATE_SET "pulse" 0.0; target: "fract_clip"; } program { name: "pulse-start"; - signal: "elm,state,pulse,start"; source: "elm"; + signal: "state,pulse,start"; source: "efl"; action: STATE_SET "pulse" 0.0; target: "pulse_clip"; target: "fract_clip"; @@ -1050,13 +1050,13 @@ group { "efl/progressbar/vertical"; after: "pulse0.1"; } program { name: "fraction"; - signal: "elm,state,fraction"; source: "elm"; + signal: "state,fraction"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.text.status"; after: "pulse-stop"; } program { name: "elmpulsestop"; - signal: "elm,state,pulse,stop"; source: "elm"; + signal: "state,pulse,stop"; source: "efl"; action: ACTION_STOP; target: "pulse0"; target: "pulse1"; @@ -1067,17 +1067,17 @@ group { "efl/progressbar/vertical"; target: "pulse_clip"; } program { name: "unit-visible"; - signal: "elm,state,units,visible"; source: "elm"; + signal: "state,units,visible"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.text.status"; } program { name: "unit-hidden"; - signal: "elm,state,units,hidden"; source: "elm"; + signal: "state,units,hidden"; source: "efl"; action: STATE_SET "hidden" 0.0; target: "elm.text.status"; } program { name: "text-visible"; - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,elm.text,set"; source: "efl"; script { new m = get_int(slmode); m |= LABEL; set_int(slmode, m); @@ -1085,7 +1085,7 @@ group { "efl/progressbar/vertical"; } } program { name: "text-hidden"; - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,elm.text,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~LABEL; set_int(slmode, m); @@ -1093,7 +1093,7 @@ group { "efl/progressbar/vertical"; } } program { name: "icon-visible"; - signal: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; script { new m = get_int(slmode); m |= ICON; set_int(slmode, m); @@ -1101,7 +1101,7 @@ group { "efl/progressbar/vertical"; } } program { name: "icon-hidden"; - signal: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~ICON; set_int(slmode, m); @@ -1109,7 +1109,7 @@ group { "efl/progressbar/vertical"; } } program { name: "elmdisabled"; - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(slmode); m |= DISABLE; set_int(slmode, m); @@ -1117,7 +1117,7 @@ group { "efl/progressbar/vertical"; } } program { name: "elmenabled"; - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(slmode); m &= ~DISABLE; set_int(slmode, m); @@ -1187,7 +1187,7 @@ group { "efl/progressbar/horizontal:wheel"; } programs { program { name: "spin"; - signal: "elm,state,pulse,start"; source: "elm"; + signal: "state,pulse,start"; source: "efl"; action: STATE_SET "spin" 0.0; transition: LINEAR 1.0; target: "knob_spinner"; @@ -1199,13 +1199,13 @@ group { "efl/progressbar/horizontal:wheel"; after: "spin"; } program { - signal: "elm,state,pulse,start"; source: "elm"; + signal: "state,pulse,start"; source: "efl"; action: STATE_SET "active" 0.0; transition: SINUSOIDAL 0.25; target: "busy_clip"; } program { - signal: "elm,state,pulse,stop"; source: "elm"; + signal: "state,pulse,stop"; source: "efl"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 1.0; target: "busy_clip"; @@ -1292,7 +1292,7 @@ group { "efl/progressbar/horizontal:double"; } programs { program { name: "inverted-on"; - signal: "elm,state,inverted,on"; source: "elm"; + signal: "state,inverted,on"; source: "efl"; action: STATE_SET "inv" 0.0; target: "bar"; target: "bar1"; @@ -1302,7 +1302,7 @@ group { "efl/progressbar/horizontal:double"; } program { name: "inverted-off"; - signal: "elm,state,inverted,off"; source: "elm"; + signal: "state,inverted,off"; source: "efl"; action: STATE_SET "default" 0.0; target: "bar"; target: "bar1"; @@ -1381,7 +1381,7 @@ group { "efl/progressbar/vertical:double"; } programs { program { name: "inverted-on"; - signal: "elm,state,inverted,on"; source: "elm"; + signal: "state,inverted,on"; source: "efl"; action: STATE_SET "inv" 0.0; target: "bar"; target: "barend"; @@ -1390,7 +1390,7 @@ group { "efl/progressbar/vertical:double"; target: "barend1"; } program { name: "inverted-off"; - signal: "elm,state,inverted,off"; source: "elm"; + signal: "state,inverted,off"; source: "efl"; action: STATE_SET "default" 0.0; target: "bar"; target: "barend"; diff --git a/data/elementary/themes/edc/efl/radio.edc b/data/elementary/themes/edc/efl/radio.edc index 8e2ccf3b63..2453f8ee53 100644 --- a/data/elementary/themes/edc/efl/radio.edc +++ b/data/elementary/themes/edc/efl/radio.edc @@ -224,20 +224,20 @@ group { "efl/radio"; programs { program { signal: "mouse,clicked,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,radio,toggle" "elm"; + action: SIGNAL_EMIT "action,radio,toggle" "efl"; } program { - signal: "elm,state,radio,on"; source: "elm"; + signal: "state,radio,on"; source: "efl"; action: STATE_SET "selected" 0.0; target: "indicator"; } program { - signal: "elm,state,radio,off"; source: "elm"; + signal: "state,radio,off"; source: "efl"; action: STATE_SET "default" 0.0; target: "indicator"; } program { - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,elm.text,set"; source: "efl"; script { new m = get_int(btmode); m |= LABEL; set_int(btmode, m); @@ -245,7 +245,7 @@ group { "efl/radio"; } } program { - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,elm.text,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~LABEL; set_int(btmode, m); @@ -253,7 +253,7 @@ group { "efl/radio"; } } program { - signal: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; script { new m = get_int(btmode); m |= ICON; set_int(btmode, m); @@ -261,7 +261,7 @@ group { "efl/radio"; } } program { - signal: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~ICON; set_int(btmode, m); @@ -269,7 +269,7 @@ group { "efl/radio"; } } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(btmode); m |= DISABLE; set_int(btmode, m); @@ -277,7 +277,7 @@ group { "efl/radio"; } } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(btmode); m &= ~DISABLE; set_int(btmode, m); diff --git a/data/elementary/themes/edc/efl/scroller.edc b/data/elementary/themes/edc/efl/scroller.edc index 032972b084..95eac24e2d 100644 --- a/data/elementary/themes/edc/efl/scroller.edc +++ b/data/elementary/themes/edc/efl/scroller.edc @@ -106,7 +106,7 @@ group { name: "efl/scroller"; program { signal: "load"; source: ""; script { - emit("reload", "elm"); + emit("reload", "efl"); action_on_pos_vbar(0); action_on_pos_hbar(0); } @@ -300,7 +300,7 @@ group { name: "efl/scroller"; } } program { - signal: "elm,action,show,vbar"; source: "elm"; + signal: "action,show,vbar"; source: "efl"; action: STATE_SET "default" 0.0; target: "sb_vbar"; target: "sb_vbar_show"; @@ -316,7 +316,7 @@ group { name: "efl/scroller"; after: "check_pos_vbar"; } program { - signal: "elm,action,hide,vbar"; source: "elm"; + signal: "action,hide,vbar"; source: "efl"; action: STATE_SET "hidden" 0.0; target: "sb_vbar"; target: "sb_vbar_show"; @@ -373,7 +373,7 @@ group { name: "efl/scroller"; target: "elm.dragable.vbar"; } program { - signal: "elm,action,scroll"; source: "elm"; + signal: "action,scroll"; source: "efl"; script { action_on_pos_vbar(10); } @@ -384,14 +384,14 @@ group { name: "efl/scroller"; } } program { name: "loop_set_vbar"; - signal: "elm,loop_y,set"; source: "elm"; + signal: "loop_y,set"; source: "efl"; script { set_int(loop_y, 1); action_on_pos_vbar(10); } } program { name: "loop_unset_vbar"; - signal: "elm,loop_y,unset"; source: "elm"; + signal: "loop_y,unset"; source: "efl"; script { set_int(loop_y, 0); action_on_pos_vbar(10); @@ -587,7 +587,7 @@ group { name: "efl/scroller"; } } program { - signal: "elm,action,show,hbar"; source: "elm"; + signal: "action,show,hbar"; source: "efl"; action: STATE_SET "default" 0.0; target: "sb_hbar"; target: "sb_hbar_show"; @@ -603,7 +603,7 @@ group { name: "efl/scroller"; after: "check_pos_hbar"; } program { - signal: "elm,action,hide,hbar"; source: "elm"; + signal: "action,hide,hbar"; source: "efl"; action: STATE_SET "hidden" 0.0; target: "sb_hbar"; target: "sb_hbar_show"; @@ -662,7 +662,7 @@ group { name: "efl/scroller"; after: "check_pos_hbar"; } program { - signal: "elm,action,scroll"; source: "elm"; + signal: "action,scroll"; source: "efl"; script { action_on_pos_hbar(10); } @@ -673,14 +673,14 @@ group { name: "efl/scroller"; } } program { name: "loop_set_hbar"; - signal: "elm,loop_x,set"; source: "elm"; + signal: "loop_x,set"; source: "efl"; script { set_int(loop_x, 1); action_on_pos_hbar(10); } } program { name: "loop_unset_hbar"; - signal: "elm,loop_x,unset"; source: "elm"; + signal: "loop_x,unset"; source: "efl"; script { set_int(loop_x, 0); action_on_pos_hbar(10); @@ -1142,7 +1142,7 @@ group { name: "efl/scroller"; } program { signal: "mouse,down,*"; source: "elm.dragable.vbar"; - action: SIGNAL_EMIT "elm,vbar,press" "elm"; + action: SIGNAL_EMIT "vbar,press" "efl"; } program { signal: "mouse,up,1"; source: "elm.dragable.vbar"; @@ -1154,7 +1154,7 @@ group { name: "efl/scroller"; } program { signal: "mouse,up,*"; source: "elm.dragable.vbar"; - action: SIGNAL_EMIT "elm,vbar,unpress" "elm"; + action: SIGNAL_EMIT "vbar,unpress" "efl"; } program { signal: "mouse,down,1*"; source: "elm.dragable.hbar"; @@ -1166,7 +1166,7 @@ group { name: "efl/scroller"; } program { signal: "mouse,down,*"; source: "elm.dragable.hbar"; - action: SIGNAL_EMIT "elm,hbar,press" "elm"; + action: SIGNAL_EMIT "hbar,press" "efl"; } program { signal: "mouse,up,1"; source: "elm.dragable.hbar"; @@ -1178,68 +1178,68 @@ group { name: "efl/scroller"; } program { signal: "mouse,up,*"; source: "elm.dragable.hbar"; - action: SIGNAL_EMIT "elm,hbar,unpress" "elm"; + action: SIGNAL_EMIT "hbar,unpress" "efl"; } program { - signal: "elm,action,looping,left"; source: "elm"; + signal: "action,looping,left"; source: "efl"; action: STATE_SET "effect" 0.0; transition: LINEAR 0.3; target: "dim_effect"; after: "looping,left,done"; } program { name: "looping,left,done"; - action: SIGNAL_EMIT "elm,looping,left,done" "elm"; + action: SIGNAL_EMIT "looping,left,done" "efl"; } program { - signal: "elm,action,looping,left,end"; source: "elm"; + signal: "action,looping,left,end"; source: "efl"; action: STATE_SET "default" 0.0; transition: LINEAR 0.3; target: "dim_effect"; } program { - signal: "elm,action,looping,right"; source: "elm"; + signal: "action,looping,right"; source: "efl"; action: STATE_SET "effect" 0.0; transition: LINEAR 0.3; target: "dim_effect"; after: "looping,right,done"; } program { name: "looping,right,done"; - action: SIGNAL_EMIT "elm,looping,right,done" "elm"; + action: SIGNAL_EMIT "looping,right,done" "efl"; } program { - signal: "elm,action,looping,right,end"; source: "elm"; + signal: "action,looping,right,end"; source: "efl"; action: STATE_SET "default" 0.0; transition: LINEAR 0.3; target: "dim_effect"; } program { - signal: "elm,action,looping,up"; source: "elm"; + signal: "action,looping,up"; source: "efl"; action: STATE_SET "effect" 0.0; transition: LINEAR 0.3; target: "dim_effect"; after: "looping,up,done"; } program { name: "looping,up,done"; - action: SIGNAL_EMIT "elm,looping,up,done" "elm"; + action: SIGNAL_EMIT "looping,up,done" "efl"; } program { - signal: "elm,action,looping,up,end"; source: "elm"; + signal: "action,looping,up,end"; source: "efl"; action: STATE_SET "default" 0.0; transition: LINEAR 0.3; target: "dim_effect"; } program { - signal: "elm,action,looping,down"; source: "elm"; + signal: "action,looping,down"; source: "efl"; action: STATE_SET "effect" 0.0; transition: LINEAR 0.3; target: "dim_effect"; after: "looping,down,done"; } program { name: "looping,down,done"; - action: SIGNAL_EMIT "elm,looping,down,done" "elm"; + action: SIGNAL_EMIT "looping,down,done" "efl"; } program { - signal: "elm,action,looping,down,end"; source: "elm"; + signal: "action,looping,down,end"; source: "efl"; action: STATE_SET "default" 0.0; transition: LINEAR 0.3; target: "dim_effect"; diff --git a/data/elementary/themes/edc/efl/slider.edc b/data/elementary/themes/edc/efl/slider.edc index 0c0609668b..2c2de26426 100644 --- a/data/elementary/themes/edc/efl/slider.edc +++ b/data/elementary/themes/edc/efl/slider.edc @@ -108,50 +108,50 @@ group { "efl/slider/horizontal/indicator"; } programs { program { - signal: "elm,popup,show"; source: "elm"; + signal: "popup,show"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.indicator"; target: "bevel"; } program { - signal: "elm,popup,hide"; source: "elm"; + signal: "popup,hide"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.indicator"; target: "bevel"; } program { - signal: "elm,popup,hide"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,hide,done" "elm"; + signal: "popup,hide"; source: "efl"; + action: SIGNAL_EMIT "popup,hide,done" "efl"; } program { - signal: "elm,state,val,show"; source: "elm"; + signal: "state,val,show"; source: "efl"; action: STATE_SET "visible" 0.0; target: "clip"; } program { - signal: "elm,state,val,hide"; source: "elm"; + signal: "state,val,hide"; source: "efl"; action: STATE_SET "default" 0.0; target: "clip"; } program { - signal: "elm,state,indicator,show"; source: "elm"; + signal: "state,indicator,show"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.indicator"; target: "bevel"; } program { - signal: "elm,state,indicator,hide"; source: "elm"; + signal: "state,indicator,hide"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.indicator"; target: "bevel"; } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "base"; } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; action: STATE_SET "default" 0.0; target: "base"; } @@ -237,50 +237,50 @@ group { "efl/slider/vertical/indicator"; } programs { program { - signal: "elm,popup,show"; source: "elm"; + signal: "popup,show"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.indicator"; target: "bevel"; } program { - signal: "elm,popup,hide"; source: "elm"; + signal: "popup,hide"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.indicator"; target: "bevel"; } program { - signal: "elm,popup,hide"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,hide,done" "elm"; + signal: "popup,hide"; source: "efl"; + action: SIGNAL_EMIT "popup,hide,done" "efl"; } program { - signal: "elm,state,val,show"; source: "elm"; + signal: "state,val,show"; source: "efl"; action: STATE_SET "visible" 0.0; target: "clip"; } program { - signal: "elm,state,val,hide"; source: "elm"; + signal: "state,val,hide"; source: "efl"; action: STATE_SET "default" 0.0; target: "clip"; } program { - signal: "elm,state,indicator,show"; source: "elm"; + signal: "state,indicator,show"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.indicator"; target: "bevel"; } program { - signal: "elm,state,indicator,hide"; source: "elm"; + signal: "state,indicator,hide"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.indicator"; target: "bevel"; } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "base"; } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; action: STATE_SET "default" 0.0; target: "base"; } @@ -727,18 +727,18 @@ group { "efl/slider/horizontal"; target: "knob"; } program { - signal: "elm,state,indicator,show"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; + signal: "state,indicator,show"; source: "efl"; + action: SIGNAL_EMIT "popup,show" "efl"; after: "popup_show2"; } program { - signal: "elm,state,indicator,hide"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; + signal: "state,indicator,hide"; source: "efl"; + action: SIGNAL_EMIT "popup,hide" "efl"; after: "popup_hide2"; } program { signal: "mouse,down,1"; source: "slideevent"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; + action: SIGNAL_EMIT "popup,show" "efl"; after: "popup_show2"; } program { name: "popup_show2"; @@ -747,7 +747,7 @@ group { "efl/slider/horizontal"; } program { signal: "mouse,up,1"; source: "slideevent"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; + action: SIGNAL_EMIT "popup,hide" "efl"; after: "popup_hide2"; } program { name: "popup_hide2"; @@ -755,7 +755,7 @@ group { "efl/slider/horizontal"; target: "button"; } program { - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,elm.text,set"; source: "efl"; script { new m = get_int(slmode); m |= LABEL; set_int(slmode, m); @@ -763,7 +763,7 @@ group { "efl/slider/horizontal"; } } program { - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,elm.text,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~LABEL; set_int(slmode, m); @@ -771,7 +771,7 @@ group { "efl/slider/horizontal"; } } program { - signal: "elm,state,icon,set"; source: "elm"; + signal: "state,icon,set"; source: "efl"; script { new m = get_int(slmode); m |= ICON; set_int(slmode, m); @@ -779,7 +779,7 @@ group { "efl/slider/horizontal"; } } program { - signal: "elm,state,icon,unset"; source: "elm"; + signal: "state,icon,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~ICON; set_int(slmode, m); @@ -787,7 +787,7 @@ group { "efl/slider/horizontal"; } } program { name: "end_show"; - signal: "elm,state,end,visible"; source: "elm"; + signal: "state,end,visible"; source: "efl"; script { new m = get_int(slmode); m |= END; set_int(slmode, m); @@ -795,7 +795,7 @@ group { "efl/slider/horizontal"; } } program { name: "end_hide"; - signal: "elm,state,end,hidden"; source: "elm"; + signal: "state,end,hidden"; source: "efl"; script { new m = get_int(slmode); m &= ~END; set_int(slmode, m); @@ -803,7 +803,7 @@ group { "efl/slider/horizontal"; } } program { - signal: "elm,state,units,visible"; source: "elm"; + signal: "state,units,visible"; source: "efl"; script { new m = get_int(slmode); m |= UNITS; set_int(slmode, m); @@ -811,12 +811,12 @@ group { "efl/slider/horizontal"; } } program { - signal: "elm,state,units,visible"; source: "elm"; - action: SIGNAL_EMIT "limits,visible" "elm"; + signal: "state,units,visible"; source: "efl"; + action: SIGNAL_EMIT "limits,visible" "efl"; target: "limits"; } program { - signal: "elm,state,units,hidden"; source: "elm"; + signal: "state,units,hidden"; source: "efl"; action: STATE_SET "default" 0.0; script { new m = get_int(slmode); @@ -825,12 +825,12 @@ group { "efl/slider/horizontal"; } } program { - signal: "elm,state,units,hidden"; source: "elm"; - action: SIGNAL_EMIT "limits,hide" "elm"; + signal: "state,units,hidden"; source: "efl"; + action: SIGNAL_EMIT "limits,hide" "efl"; target: "limits"; } program { - signal: "elm,state,inverted,on"; source: "elm"; + signal: "state,inverted,on"; source: "efl"; script { new m = get_int(slmode); m |= INVERT; set_int(slmode, m); @@ -838,7 +838,7 @@ group { "efl/slider/horizontal"; } } program { - signal: "elm,state,inverted,off"; source: "elm"; + signal: "state,inverted,off"; source: "efl"; script { new m = get_int(slmode); m &= ~INVERT; set_int(slmode, m); @@ -846,7 +846,7 @@ group { "efl/slider/horizontal"; } } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(slmode); m |= DISABLE; set_int(slmode, m); @@ -854,7 +854,7 @@ group { "efl/slider/horizontal"; } } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(slmode); m &= ~DISABLE; set_int(slmode, m); @@ -1314,18 +1314,18 @@ group { "efl/slider/vertical"; target: "knob"; } program { - signal: "elm,state,indicator,show"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; + signal: "state,indicator,show"; source: "efl"; + action: SIGNAL_EMIT "popup,show" "efl"; after: "popup_show2"; } program { - signal: "elm,state,indicator,hide"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; + signal: "state,indicator,hide"; source: "efl"; + action: SIGNAL_EMIT "popup,hide" "efl"; after: "popup_hide2"; } program { signal: "mouse,down,1"; source: "slideevent"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; + action: SIGNAL_EMIT "popup,show" "efl"; after: "popup_show2"; } program { name: "popup_show2"; @@ -1334,7 +1334,7 @@ group { "efl/slider/vertical"; } program { signal: "mouse,up,1"; source: "slideevent"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; + action: SIGNAL_EMIT "popup,hide" "efl"; after: "popup_hide2"; } program { name: "popup_hide2"; @@ -1342,7 +1342,7 @@ group { "efl/slider/vertical"; target: "button"; } program { - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,elm.text,set"; source: "efl"; script { new m = get_int(slmode); m |= LABEL; set_int(slmode, m); @@ -1350,7 +1350,7 @@ group { "efl/slider/vertical"; } } program { - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,elm.text,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~LABEL; set_int(slmode, m); @@ -1358,7 +1358,7 @@ group { "efl/slider/vertical"; } } program { - signal: "elm,state,icon,set"; source: "elm"; + signal: "state,icon,set"; source: "efl"; script { new m = get_int(slmode); m |= ICON; set_int(slmode, m); @@ -1366,7 +1366,7 @@ group { "efl/slider/vertical"; } } program { - signal: "elm,state,icon,unset"; source: "elm"; + signal: "state,icon,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~ICON; set_int(slmode, m); @@ -1374,7 +1374,7 @@ group { "efl/slider/vertical"; } } program { name: "end_show"; - signal: "elm,state,end,visible"; source: "elm"; + signal: "state,end,visible"; source: "efl"; script { new m = get_int(slmode); m |= END; set_int(slmode, m); @@ -1382,7 +1382,7 @@ group { "efl/slider/vertical"; } } program { name: "end_hide"; - signal: "elm,state,end,hidden"; source: "elm"; + signal: "state,end,hidden"; source: "efl"; script { new m = get_int(slmode); m &= ~END; set_int(slmode, m); @@ -1390,7 +1390,7 @@ group { "efl/slider/vertical"; } } program { - signal: "elm,state,units,visible"; source: "elm"; + signal: "state,units,visible"; source: "efl"; script { new m = get_int(slmode); m |= UNITS; set_int(slmode, m); @@ -1398,11 +1398,11 @@ group { "efl/slider/vertical"; } } program { - signal: "elm,state,units,visible"; source: "elm"; - action: SIGNAL_EMIT "limits:limits,visible" "elm"; + signal: "state,units,visible"; source: "efl"; + action: SIGNAL_EMIT "limits:limits,visible" "efl"; } program { - signal: "elm,state,units,hidden"; source: "elm"; + signal: "state,units,hidden"; source: "efl"; action: STATE_SET "default" 0.0; script { new m = get_int(slmode); @@ -1411,11 +1411,11 @@ group { "efl/slider/vertical"; } } program { - signal: "elm,state,units,hidden"; source: "elm"; - action: SIGNAL_EMIT "limits:limits,hide" "elm"; + signal: "state,units,hidden"; source: "efl"; + action: SIGNAL_EMIT "limits:limits,hide" "efl"; } program { - signal: "elm,state,inverted,on"; source: "elm"; + signal: "state,inverted,on"; source: "efl"; script { new m = get_int(slmode); m |= INVERT; set_int(slmode, m); @@ -1423,7 +1423,7 @@ group { "efl/slider/vertical"; } } program { - signal: "elm,state,inverted,off"; source: "elm"; + signal: "state,inverted,off"; source: "efl"; script { new m = get_int(slmode); m &= ~INVERT; set_int(slmode, m); @@ -1431,7 +1431,7 @@ group { "efl/slider/vertical"; } } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(slmode); m |= DISABLE; set_int(slmode, m); @@ -1439,7 +1439,7 @@ group { "efl/slider/vertical"; } } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(slmode); m &= ~DISABLE; set_int(slmode, m); @@ -2039,8 +2039,8 @@ group { "efl/slider_interval/horizontal"; target: "knob"; } program { - signal: "elm,slider,range,enable"; - source: "elm"; + signal: "slider,range,enable"; + source: "efl"; script { set_int(range, 1); set_state(PART:"button2", "show", 0.0); @@ -2054,8 +2054,8 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,slider,range,disable"; - source: "elm"; + signal: "slider,range,disable"; + source: "efl"; script { set_int(range, 0); set_state(PART:"button2", "default", 0.0); @@ -2079,18 +2079,18 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,state,indicator,show"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; + signal: "state,indicator,show"; source: "efl"; + action: SIGNAL_EMIT "popup,show" "efl"; after: "popup_show2"; } program { - signal: "elm,state,indicator,hide"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; + signal: "state,indicator,hide"; source: "efl"; + action: SIGNAL_EMIT "popup,hide" "efl"; after: "popup_hide2"; } program { signal: "mouse,down,1"; source: "slideevent"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; + action: SIGNAL_EMIT "popup,show" "efl"; after: "popup_show2"; } program { name: "popup_show2"; @@ -2099,7 +2099,7 @@ group { "efl/slider_interval/horizontal"; } program { signal: "mouse,up,1"; source: "slideevent"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; + action: SIGNAL_EMIT "popup,hide" "efl"; after: "popup_hide2"; } program { name: "popup_hide2"; @@ -2108,7 +2108,7 @@ group { "efl/slider_interval/horizontal"; } program { signal: "mouse,down,1"; source: "slideevent2"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; + action: SIGNAL_EMIT "popup,show" "efl"; after: "popup2_show2"; } program { name: "popup2_show2"; @@ -2117,7 +2117,7 @@ group { "efl/slider_interval/horizontal"; } program { signal: "mouse,up,1"; source: "slideevent2"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; + action: SIGNAL_EMIT "popup,hide" "efl"; after: "popup2_hide2"; } program { name: "popup2_hide2"; @@ -2125,7 +2125,7 @@ group { "efl/slider_interval/horizontal"; target: "button2"; } program { - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,elm.text,set"; source: "efl"; script { new m = get_int(slmode); m |= LABEL; set_int(slmode, m); @@ -2133,7 +2133,7 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,elm.text,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~LABEL; set_int(slmode, m); @@ -2141,7 +2141,7 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,state,icon,set"; source: "elm"; + signal: "state,icon,set"; source: "efl"; script { new m = get_int(slmode); m |= ICON; set_int(slmode, m); @@ -2149,7 +2149,7 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,state,icon,unset"; source: "elm"; + signal: "state,icon,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~ICON; set_int(slmode, m); @@ -2157,7 +2157,7 @@ group { "efl/slider_interval/horizontal"; } } program { name: "end_show"; - signal: "elm,state,end,visible"; source: "elm"; + signal: "state,end,visible"; source: "efl"; script { new m = get_int(slmode); m |= END; set_int(slmode, m); @@ -2165,7 +2165,7 @@ group { "efl/slider_interval/horizontal"; } } program { name: "end_hide"; - signal: "elm,state,end,hidden"; source: "elm"; + signal: "state,end,hidden"; source: "efl"; script { new m = get_int(slmode); m &= ~END; set_int(slmode, m); @@ -2173,7 +2173,7 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,state,units,visible"; source: "elm"; + signal: "state,units,visible"; source: "efl"; script { new m = get_int(slmode); m |= UNITS; set_int(slmode, m); @@ -2181,12 +2181,12 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,state,units,visible"; source: "elm"; - action: SIGNAL_EMIT "limits,visible" "elm"; + signal: "state,units,visible"; source: "efl"; + action: SIGNAL_EMIT "limits,visible" "efl"; target: "limits"; } program { - signal: "elm,state,units,hidden"; source: "elm"; + signal: "state,units,hidden"; source: "efl"; action: STATE_SET "default" 0.0; script { new m = get_int(slmode); @@ -2195,12 +2195,12 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,state,units,hidden"; source: "elm"; - action: SIGNAL_EMIT "limits,hide" "elm"; + signal: "state,units,hidden"; source: "efl"; + action: SIGNAL_EMIT "limits,hide" "efl"; target: "limits"; } program { - signal: "elm,state,inverted,on"; source: "elm"; + signal: "state,inverted,on"; source: "efl"; script { new m = get_int(slmode); m |= INVERT; set_int(slmode, m); @@ -2208,7 +2208,7 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,state,inverted,off"; source: "elm"; + signal: "state,inverted,off"; source: "efl"; script { new m = get_int(slmode); m &= ~INVERT; set_int(slmode, m); @@ -2216,7 +2216,7 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(slmode); m |= DISABLE; set_int(slmode, m); @@ -2224,7 +2224,7 @@ group { "efl/slider_interval/horizontal"; } } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(slmode); m &= ~DISABLE; set_int(slmode, m); @@ -2824,8 +2824,8 @@ group { "efl/slider_interval/vertical"; target: "knob"; } program { - signal: "elm,slider,range,enable"; - source: "elm"; + signal: "slider,range,enable"; + source: "efl"; script { set_int(range, 1); set_state(PART:"button2", "show", 0.0); @@ -2839,8 +2839,8 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,slider,range,disable"; - source: "elm"; + signal: "slider,range,disable"; + source: "efl"; script { set_int(range, 0); set_state(PART:"button2", "default", 0.0); @@ -2864,18 +2864,18 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,state,indicator,show"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; + signal: "state,indicator,show"; source: "efl"; + action: SIGNAL_EMIT "popup,show" "efl"; after: "popup_show2"; } program { - signal: "elm,state,indicator,hide"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; + signal: "state,indicator,hide"; source: "efl"; + action: SIGNAL_EMIT "popup,hide" "efl"; after: "popup_hide2"; } program { signal: "mouse,down,1"; source: "slideevent"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; + action: SIGNAL_EMIT "popup,show" "efl"; after: "popup_show2"; } program { name: "popup_show2"; @@ -2884,7 +2884,7 @@ group { "efl/slider_interval/vertical"; } program { signal: "mouse,up,1"; source: "slideevent"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; + action: SIGNAL_EMIT "popup,hide" "efl"; after: "popup_hide2"; } program { name: "popup_hide2"; @@ -2893,7 +2893,7 @@ group { "efl/slider_interval/vertical"; } program { signal: "mouse,down,1"; source: "slideevent2"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; + action: SIGNAL_EMIT "popup,show" "efl"; after: "popup2_show2"; } program { name: "popup2_show2"; @@ -2902,7 +2902,7 @@ group { "efl/slider_interval/vertical"; } program { signal: "mouse,up,1"; source: "slideevent2"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; + action: SIGNAL_EMIT "popup,hide" "efl"; after: "popup2_hide2"; } program { name: "popup2_hide2"; @@ -2910,7 +2910,7 @@ group { "efl/slider_interval/vertical"; target: "button2"; } program { - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,elm.text,set"; source: "efl"; script { new m = get_int(slmode); m |= LABEL; set_int(slmode, m); @@ -2918,7 +2918,7 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,elm.text,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~LABEL; set_int(slmode, m); @@ -2926,7 +2926,7 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,state,icon,set"; source: "elm"; + signal: "state,icon,set"; source: "efl"; script { new m = get_int(slmode); m |= ICON; set_int(slmode, m); @@ -2934,7 +2934,7 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,state,icon,unset"; source: "elm"; + signal: "state,icon,unset"; source: "efl"; script { new m = get_int(slmode); m &= ~ICON; set_int(slmode, m); @@ -2942,7 +2942,7 @@ group { "efl/slider_interval/vertical"; } } program { name: "end_show"; - signal: "elm,state,end,visible"; source: "elm"; + signal: "state,end,visible"; source: "efl"; script { new m = get_int(slmode); m |= END; set_int(slmode, m); @@ -2950,7 +2950,7 @@ group { "efl/slider_interval/vertical"; } } program { name: "end_hide"; - signal: "elm,state,end,hidden"; source: "elm"; + signal: "state,end,hidden"; source: "efl"; script { new m = get_int(slmode); m &= ~END; set_int(slmode, m); @@ -2958,7 +2958,7 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,state,units,visible"; source: "elm"; + signal: "state,units,visible"; source: "efl"; script { new m = get_int(slmode); m |= UNITS; set_int(slmode, m); @@ -2966,11 +2966,11 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,state,units,visible"; source: "elm"; - action: SIGNAL_EMIT "limits:limits,visible" "elm"; + signal: "state,units,visible"; source: "efl"; + action: SIGNAL_EMIT "limits:limits,visible" "efl"; } program { - signal: "elm,state,units,hidden"; source: "elm"; + signal: "state,units,hidden"; source: "efl"; action: STATE_SET "default" 0.0; script { new m = get_int(slmode); @@ -2979,11 +2979,11 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,state,units,hidden"; source: "elm"; - action: SIGNAL_EMIT "limits:limits,hide" "elm"; + signal: "state,units,hidden"; source: "efl"; + action: SIGNAL_EMIT "limits:limits,hide" "efl"; } program { - signal: "elm,state,inverted,on"; source: "elm"; + signal: "state,inverted,on"; source: "efl"; script { new m = get_int(slmode); m |= INVERT; set_int(slmode, m); @@ -2991,7 +2991,7 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,state,inverted,off"; source: "elm"; + signal: "state,inverted,off"; source: "efl"; script { new m = get_int(slmode); m &= ~INVERT; set_int(slmode, m); @@ -2999,7 +2999,7 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; script { new m = get_int(slmode); m |= DISABLE; set_int(slmode, m); @@ -3007,7 +3007,7 @@ group { "efl/slider_interval/vertical"; } } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; script { new m = get_int(slmode); m &= ~DISABLE; set_int(slmode, m); diff --git a/data/elementary/themes/edc/efl/spin_button.edc b/data/elementary/themes/edc/efl/spin_button.edc index 4d502e3779..7ce94dd39d 100644 --- a/data/elementary/themes/edc/efl/spin_button.edc +++ b/data/elementary/themes/edc/efl/spin_button.edc @@ -110,50 +110,50 @@ group { "efl/spin_button"; } programs { program { "entry_active"; - signal: "elm,state,entry,active"; - source: "elm"; + signal: "state,entry,active"; + source: "efl"; action: STATE_SET "active"; target: "elm.swallow.entry"; } program { "entry_inactive"; - signal: "elm,state,entry,inactive"; - source: "elm"; + signal: "state,entry,inactive"; + source: "efl"; action: STATE_SET "default"; target: "elm.swallow.entry"; } program { "text_button_active"; - signal: "elm,state,button,active"; - source: "elm"; + signal: "state,button,active"; + source: "efl"; action: STATE_SET "default"; target: "elm.swallow.text_button"; } program { "text_button_inactive"; - signal: "elm,state,button,inactive"; - source: "elm"; + signal: "state,button,inactive"; + source: "efl"; action: STATE_SET "inactive"; target: "elm.swallow.text_button"; } program { "access_activate"; - signal: "elm,state,access,active"; - source: "elm"; + signal: "state,access,active"; + source: "efl"; action: STATE_SET "active"; target: "access"; } program { "access_inactivate"; - signal: "elm,state,access,inactive"; - source: "elm"; + signal: "state,access,inactive"; + source: "efl"; action: STATE_SET "default"; target: "access"; } program { "disable"; - signal: "elm,state,disabled"; - source: "elm"; + signal: "state,disabled"; + source: "efl"; action: STATE_SET "disabled"; target: "disabler"; } program { "enable"; - signal: "elm,state,enabled"; - source: "elm"; + signal: "state,enabled"; + source: "efl"; action: STATE_SET "default"; target: "disabler"; } @@ -264,7 +264,7 @@ group { name: "efl/spin_button/inc_button"; } } program { name: "button_press2"; - action: SIGNAL_EMIT "elm,action,press" ""; + action: SIGNAL_EMIT "action,press" ""; after: "button_press_anim"; } program { name: "button_press_anim"; @@ -283,7 +283,7 @@ group { name: "efl/spin_button/inc_button"; } } program { name: "button_unpress2"; - action: SIGNAL_EMIT "elm,action,unpress" ""; + action: SIGNAL_EMIT "action,unpress" ""; } program { name: "button_unpress_anim"; action: STATE_SET "default" 0.0; @@ -299,21 +299,21 @@ group { name: "efl/spin_button/inc_button"; } } program { name: "action_unpressed"; - signal: "elm,action,unpressed"; - source: "elm"; + signal: "action,unpressed"; + source: "efl"; after: "button_unpress_anim"; } program { name: "action_pressed"; - signal: "elm,action,pressed"; - source: "elm"; + signal: "action,pressed"; + source: "efl"; after: "button_press_anim"; } program { name: "button_click2"; - action: SIGNAL_EMIT "elm,action,click" ""; + action: SIGNAL_EMIT "action,click" ""; } program { name: "access_pressed"; - signal: "elm,action,anim,activate"; - source: "elm"; + signal: "action,anim,activate"; + source: "efl"; action: STATE_SET "pressed" 0.0; target: "arrow.image"; after: "access_pressed_anim"; @@ -324,31 +324,31 @@ group { name: "efl/spin_button/inc_button"; target: "arrow.image"; } program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; + signal: "state,disabled"; + source: "efl"; action: STATE_SET "disabled" 0.0; target: "arrow.image"; target: "disabler"; } program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; + signal: "state,enabled"; + source: "efl"; action: STATE_SET "default" 0.0; target: "arrow.image"; target: "disabler"; } program { name: "multi_down"; - signal: "elm,action,multi,down"; - source: "elm"; + signal: "action,multi,down"; + source: "efl"; script { set_int(multi_down, 1); } } program { name: "multi_up"; - signal: "elm,action,multi,up"; - source: "elm"; + signal: "action,multi,up"; + source: "efl"; script { set_int(multi_down, 0); } @@ -439,18 +439,18 @@ group { name: "efl/spin_button/text_button"; } } program { name: "button_click2"; - action: SIGNAL_EMIT "elm,action,click" ""; + action: SIGNAL_EMIT "action,click" ""; } program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; + signal: "state,disabled"; + source: "efl"; action: STATE_SET "disabled" 0.0; target: "disabler"; target: "elm.text"; } program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; + signal: "state,enabled"; + source: "efl"; action: STATE_SET "default" 0.0; target: "disabler"; target: "elm.text"; diff --git a/data/elementary/themes/edc/efl/text.edc b/data/elementary/themes/edc/efl/text.edc index 8f8e4c30d3..37d6b49a66 100644 --- a/data/elementary/themes/edc/efl/text.edc +++ b/data/elementary/themes/edc/efl/text.edc @@ -57,12 +57,12 @@ group { "efl/text/scroller"; } } program { - signal: "elm,action,show,icon"; source: "elm"; + signal: "action,show,icon"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.swallow.icon"; } program { - signal: "elm,action,hide,icon"; source: "elm"; + signal: "action,hide,icon"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.swallow.icon"; } @@ -85,12 +85,12 @@ group { "efl/text/scroller"; } } program { - signal: "elm,action,show,end"; source: "elm"; + signal: "action,show,end"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.swallow.end"; } program { - signal: "elm,action,hide,end"; source: "elm"; + signal: "action,hide,end"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.swallow.end"; } @@ -118,7 +118,7 @@ group { "efl/text/scroller"; } programs { program { - signal: "elm,action,focus_highlight,show"; source: "elm"; + signal: "action,focus_highlight,show"; source: "efl"; action: STATE_SET "focused" 0.0; target: "glow"; after: "focus_in2"; @@ -129,26 +129,26 @@ group { "efl/text/scroller"; target: "glow"; } program { - signal: "elm,action,focus_highlight,hide"; source: "elm"; + signal: "action,focus_highlight,hide"; source: "efl"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.3; target: "glow"; } program { name: "validation_fail"; signal: "validation,default,fail"; - source: "elm"; + source: "efl"; action: STATE_SET "fail" 0.0; target: "validation_glow"; } program { name: "validation_pass"; signal: "validation,default,pass"; - source: "elm"; + source: "efl"; action: STATE_SET "pass" 0.0; target: "validation_glow"; } program { name: "validation_off"; signal: "validation,default"; - source: "elm"; + source: "efl"; action: STATE_SET "default" 0.0; target: "validation_glow"; } @@ -262,12 +262,12 @@ group { "efl/text/single/scroller"; } } program { - signal: "elm,action,show,icon"; source: "elm"; + signal: "action,show,icon"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.swallow.icon"; } program { - signal: "elm,action,hide,icon"; source: "elm"; + signal: "action,hide,icon"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.swallow.icon"; } @@ -288,12 +288,12 @@ group { "efl/text/single/scroller"; } } program { - signal: "elm,action,show,end"; source: "elm"; + signal: "action,show,end"; source: "efl"; action: STATE_SET "visible" 0.0; target: "elm.swallow.end"; } program { - signal: "elm,action,hide,end"; source: "elm"; + signal: "action,hide,end"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.swallow.end"; } @@ -350,7 +350,7 @@ group { "efl/text/single/scroller"; } programs { program { - signal: "elm,action,focus_highlight,show"; source: "elm"; + signal: "action,focus_highlight,show"; source: "efl"; action: STATE_SET "focused" 0.0; target: "glow"; after: "focus_in2"; @@ -361,26 +361,26 @@ group { "efl/text/single/scroller"; target: "glow"; } program { - signal: "elm,action,focus_highlight,hide"; source: "elm"; + signal: "action,focus_highlight,hide"; source: "efl"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.3; target: "glow"; } program { name: "validation_fail"; signal: "validation,default,fail"; - source: "elm"; + source: "efl"; action: STATE_SET "fail" 0.0; target: "validation_glow"; } program { name: "validation_pass"; signal: "validation,default,pass"; - source: "elm"; + source: "efl"; action: STATE_SET "pass" 0.0; target: "validation_glow"; } program { name: "validation_off"; signal: "validation,default"; - source: "elm"; + source: "efl"; action: STATE_SET "default" 0.0; target: "validation_glow"; } @@ -437,7 +437,7 @@ group { "efl/text/cursor"; target: "clipper"; } program { - signal: "elm,action,focus"; source: "elm"; + signal: "action,focus"; source: "efl"; action: ACTION_STOP; target: "cursor_show"; target: "cursor_hide"; @@ -446,7 +446,7 @@ group { "efl/text/cursor"; after: "cursor_show"; } program { - signal: "elm,action,unfocus"; source: "elm"; + signal: "action,unfocus"; source: "efl"; action: ACTION_STOP; target: "cursor_show"; target: "cursor_hide"; @@ -455,7 +455,7 @@ group { "efl/text/cursor"; after: "cursor_hide_stop"; } program { - signal: "elm,action,show,cursor"; source: "elm"; + signal: "action,show,cursor"; source: "efl"; action: ACTION_STOP; target: "cursor_show"; target: "cursor_hide"; @@ -582,23 +582,23 @@ group { "efl/text"; target: "elm.text"; } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "state,disabled"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "elm.text"; } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "state,enabled"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.text"; } #if 0 program { - signal: "elm,guide,disabled"; source: "elm"; + signal: "guide,disabled"; source: "efl"; action: STATE_SET "hidden" 0.0; target: "elm.guide"; } program { - signal: "elm,guide,enabled"; source: "elm"; + signal: "guide,enabled"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.guide"; } @@ -675,14 +675,14 @@ group { "efl/text/magnifier"; } programs { program { name: "magnifier_show"; - signal: "elm,action,show,magnifier"; source: "elm"; + signal: "action,show,magnifier"; source: "efl"; action: STATE_SET "default" 0.0; target: "elm.swallow.content"; target: "bg"; target: "over"; } program { name: "magnifier_hide"; - signal: "elm,action,hide,magnifier"; source: "elm"; + signal: "action,hide,magnifier"; source: "efl"; action: STATE_SET "hidden" 0.0; target: "elm.swallow.content"; target: "bg"; @@ -725,13 +725,13 @@ group { "efl/text/handler/start"; } programs { program { - signal: "elm,handler,show"; source: "elm"; + signal: "handler,show"; source: "efl"; action: STATE_SET "visible" 0.0; target: "base"; target: "event"; } program { - signal: "elm,handler,hide"; source: "elm"; + signal: "handler,hide"; source: "efl"; action: STATE_SET "default" 0.0; target: "base"; target: "event"; @@ -773,13 +773,13 @@ group { "efl/text/handler/end"; } programs { program { - signal: "elm,handler,show"; source: "elm"; + signal: "handler,show"; source: "efl"; action: STATE_SET "visible" 0.0; target: "base"; target: "event"; } program { - signal: "elm,handler,hide"; source: "elm"; + signal: "handler,hide"; source: "efl"; action: STATE_SET "default" 0.0; target: "base"; target: "event"; diff --git a/data/elementary/themes/edc/efl/tooltip.edc b/data/elementary/themes/edc/efl/tooltip.edc index 389d3894e6..bf42ddffed 100644 --- a/data/elementary/themes/edc/efl/tooltip.edc +++ b/data/elementary/themes/edc/efl/tooltip.edc @@ -365,7 +365,7 @@ group { name: "efl/tooltip"; } programs { program { name: "show0"; - signal: "elm,action,show"; source: "elm"; + signal: "action,show"; source: "efl"; action: ACTION_STOP; target: "hide0"; target: "hide1"; @@ -386,7 +386,7 @@ group { name: "efl/tooltip"; target: "clipper_content"; } program { name: "hide0"; - signal: "elm,action,hide"; source: "elm"; + signal: "action,hide"; source: "efl"; action: ACTION_STOP; target: "show0"; target: "show1"; diff --git a/data/elementary/themes/edc/efl/uiclock.edc b/data/elementary/themes/edc/efl/uiclock.edc index ac37fdc793..ba2e011f8c 100644 --- a/data/elementary/themes/edc/efl/uiclock.edc +++ b/data/elementary/themes/edc/efl/uiclock.edc @@ -21,13 +21,13 @@ programs{ \ program { "field_"#_pos"enabled"; \ signal: "field"#_pos",enable"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "enable"; \ target: "field"#_pos; \ } \ program { "field_"#_pos"disabled"; \ signal: "field"#_pos",disable"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "default"; \ target: "field"#_pos; \ } \ @@ -88,14 +88,14 @@ programs { \ program { \ signal: "field"#_after",enable"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "enable"; \ target: "separator"#_pos; \ target: "separator"#_pos"d"; \ } \ program { \ signal: "field"#_after",disable"; \ - source: "elm"; \ + source: "efl"; \ action: STATE_SET "default"; \ target: "separator"#_pos; \ target: "separator"#_pos"d"; \ @@ -191,16 +191,16 @@ group { "efl/uiclock"; } programs { program { - signal: "elm,state,disabled"; - source: "elm"; + signal: "state,disabled"; + source: "efl"; action: STATE_SET "disabled"; target: "disclip"; target: "disclip2"; target: "discover"; } program { - signal: "elm,state,enabled"; - source: "elm"; + signal: "state,enabled"; + source: "efl"; action: STATE_SET "default"; target: "disclip"; target: "disclip2"; diff --git a/data/elementary/themes/edc/efl/video.edc b/data/elementary/themes/edc/efl/video.edc index 1f943a8096..d674b16535 100644 --- a/data/elementary/themes/edc/efl/video.edc +++ b/data/elementary/themes/edc/efl/video.edc @@ -17,24 +17,24 @@ group { name: "efl/video"; } programs { program { - signal: "elm,video,load"; source: "elm"; + signal: "video,load"; source: "efl"; action: STATE_SET "darker" 0.0; target: "clipper"; } program { - signal: "elm,video,play"; source: "elm"; + signal: "video,play"; source: "efl"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.2 CURRENT; target: "clipper"; } program { - signal: "elm,video,end"; source: "elm"; + signal: "video,end"; source: "efl"; action: STATE_SET "darker" 0.0; transition: SINUSOIDAL 0.5 CURRENT; target: "clipper"; } program { - signal: "elm,video,pause"; source: "elm"; + signal: "video,pause"; source: "efl"; action: STATE_SET "darker" 0.0; transition: SINUSOIDAL 0.7 CURRENT; target: "clipper"; diff --git a/data/elementary/themes/edc/efl/win.edc b/data/elementary/themes/edc/efl/win.edc index c217f62b16..323b2a4bbf 100644 --- a/data/elementary/themes/edc/efl/win.edc +++ b/data/elementary/themes/edc/efl/win.edc @@ -6,13 +6,13 @@ group { name: "efl/win"; clip_to: "client_clip"; desc { "default"; rel2.relative: 1 0; - link.base: "elm,action,hide" "elm"; + link.base: "action,hide" "efl"; align: 0.5 0.0; hid; } desc { "visible"; inherit: "default"; - link.base: "elm,action,show_menu" "elm"; + link.base: "action,show_menu" "efl"; fixed: 0 1; vis; } @@ -24,7 +24,7 @@ group { name: "efl/win"; desc { "with_menu"; rel1.to: "elm.swallow.menu"; rel1.relative: 0 1; - link.base: "elm,action,show_menu" "elm"; + link.base: "action,show_menu" "efl"; } } } diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index db291f1ace..7aa00eef06 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -88,7 +88,11 @@ _efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd efl_event_callback_legacy_call (obj, EFL_UI_EVENT_CLICKED, NULL); - elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); + + if (elm_widget_is_legacy(obj)) + elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); + else + elm_layout_signal_emit(obj, "anim,activate", "efl"); return EINA_TRUE; } @@ -96,7 +100,11 @@ _efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) { - elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); + if (elm_widget_is_legacy(obj)) + elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); + else + elm_layout_signal_emit(obj, "anim,activate", "efl"); + _activate(obj); return EINA_TRUE; } @@ -204,15 +212,30 @@ _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_ efl_canvas_group_add(efl_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); - edje_object_signal_callback_add - (wd->resize_obj, "elm,action,click", "*", - _on_clicked_signal, obj); - edje_object_signal_callback_add - (wd->resize_obj, "elm,action,press", "*", - _on_pressed_signal, obj); - edje_object_signal_callback_add - (wd->resize_obj, "elm,action,unpress", "*", - _on_unpressed_signal, obj); + if (elm_widget_is_legacy(obj)) + { + edje_object_signal_callback_add + (wd->resize_obj, "elm,action,click", "*", + _on_clicked_signal, obj); + edje_object_signal_callback_add + (wd->resize_obj, "elm,action,press", "*", + _on_pressed_signal, obj); + edje_object_signal_callback_add + (wd->resize_obj, "elm,action,unpress", "*", + _on_unpressed_signal, obj); + } + else + { + edje_object_signal_callback_add + (wd->resize_obj, "action,click", "*", + _on_clicked_signal, obj); + edje_object_signal_callback_add + (wd->resize_obj, "action,press", "*", + _on_pressed_signal, obj); + edje_object_signal_callback_add + (wd->resize_obj, "action,unpress", "*", + _on_unpressed_signal, obj); + } _elm_access_object_register(obj, wd->resize_obj); _elm_access_text_set @@ -409,10 +432,19 @@ _icon_signal_emit(Evas_Object *obj) char buf[64]; if (!elm_widget_resize_object_get(obj)) return; - snprintf(buf, sizeof(buf), "elm,state,icon,%s", - elm_layout_content_get(obj, "icon") ? "visible" : "hidden"); + if (elm_widget_is_legacy(obj)) + { + snprintf(buf, sizeof(buf), "elm,state,icon,%s", + elm_layout_content_get(obj, "icon") ? "visible" : "hidden"); + elm_layout_signal_emit(obj, buf, "elm"); + } + else + { + snprintf(buf, sizeof(buf), "state,content,%s", + elm_layout_content_get(obj, "icon") ? "set" : "unset"); + elm_layout_signal_emit(obj, buf, "efl"); + } - elm_layout_signal_emit(obj, buf, "elm"); edje_object_message_signal_process(elm_layout_edje_get(obj)); elm_layout_sizing_eval(obj); } diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c index e630b1dc22..a26f2fc8b1 100644 --- a/src/lib/elementary/efl_ui_calendar.c +++ b/src/lib/elementary/efl_ui_calendar.c @@ -16,10 +16,10 @@ #define MY_CLASS_NAME "Efl.Ui.Calendar" #define MY_CLASS_PFX efl_ui_calendar -#define EFL_UI_CALENDAR_BUTTON_LEFT "elm,calendar,button,left" -#define EFL_UI_CALENDAR_BUTTON_RIGHT "elm,calendar,button,right" -#define EFL_UI_CALENDAR_BUTTON_YEAR_LEFT "elm,calendar,button_year,left" -#define EFL_UI_CALENDAR_BUTTON_YEAR_RIGHT "elm,calendar,button_year,right" +#define EFL_UI_CALENDAR_BUTTON_LEFT "calendar,button,left" +#define EFL_UI_CALENDAR_BUTTON_RIGHT "calendar,button,right" +#define EFL_UI_CALENDAR_BUTTON_YEAR_LEFT "calendar,button_year,left" +#define EFL_UI_CALENDAR_BUTTON_YEAR_RIGHT "calendar,button_year,right" static const char PART_NAME_DEC_BUTTON[] = "dec_button"; static const char PART_NAME_INC_BUTTON[] = "inc_button"; @@ -112,7 +112,7 @@ _unselect(Evas_Object *obj, char emission[32]; snprintf(emission, sizeof(emission), "cit_%d,unselected", selected); - elm_layout_signal_emit(obj, emission, "elm"); + elm_layout_signal_emit(obj, emission, "efl"); } static inline void @@ -125,7 +125,7 @@ _select(Evas_Object *obj, sd->focused_it = sd->selected_it = selected; snprintf(emission, sizeof(emission), "cit_%d,selected", selected); - elm_layout_signal_emit(obj, emission, "elm"); + elm_layout_signal_emit(obj, emission, "efl"); } static inline void @@ -134,7 +134,7 @@ _not_today(Efl_Ui_Calendar_Data *sd) char emission[32]; snprintf(emission, sizeof(emission), "cit_%d,not_today", sd->today_it); - elm_layout_signal_emit(sd->obj, emission, "elm"); + elm_layout_signal_emit(sd->obj, emission, "efl"); sd->today_it = -1; } @@ -145,7 +145,7 @@ _today(Efl_Ui_Calendar_Data *sd, char emission[32]; snprintf(emission, sizeof(emission), "cit_%d,today", it); - elm_layout_signal_emit(sd->obj, emission, "elm"); + elm_layout_signal_emit(sd->obj, emission, "efl"); sd->today_it = it; } @@ -156,7 +156,7 @@ _enable(Efl_Ui_Calendar_Data *sd, char emission[32]; snprintf(emission, sizeof(emission), "cit_%d,enable", it); - elm_layout_signal_emit(sd->obj, emission, "elm"); + elm_layout_signal_emit(sd->obj, emission, "efl"); } static inline void @@ -166,7 +166,7 @@ _disable(Efl_Ui_Calendar_Data *sd, char emission[32]; snprintf(emission, sizeof(emission), "cit_%d,disable", it); - elm_layout_signal_emit(sd->obj, emission, "elm"); + elm_layout_signal_emit(sd->obj, emission, "efl"); } static void @@ -759,7 +759,7 @@ _update_unfocused_it(Evas_Object *obj, int unfocused_it) sd->focused_it = -1; snprintf(emission, sizeof(emission), "cit_%d,unfocused", unfocused_it); - elm_layout_signal_emit(obj, emission, "elm"); + elm_layout_signal_emit(obj, emission, "efl"); } static Eina_Bool @@ -775,12 +775,12 @@ _update_focused_it(Evas_Object *obj, int focused_it) return EINA_FALSE; snprintf(emission, sizeof(emission), "cit_%d,unfocused", sd->focused_it); - elm_layout_signal_emit(obj, emission, "elm"); + elm_layout_signal_emit(obj, emission, "efl"); sd->focused_it = focused_it; snprintf(emission, sizeof(emission), "cit_%d,focused", sd->focused_it); - elm_layout_signal_emit(obj, emission, "elm"); + elm_layout_signal_emit(obj, emission, "efl"); return EINA_TRUE; } @@ -986,7 +986,7 @@ _efl_ui_calendar_constructor_internal(Eo *obj, Efl_Ui_Calendar_Data *priv) priv->format_cb = NULL; edje_object_signal_callback_add - (wd->resize_obj, "elm,action,selected", "*", + (wd->resize_obj, "action,selected", "*", _day_selected, obj); current_date = time(NULL); diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index 168ab6304e..d996365d2c 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -59,9 +59,9 @@ _activate(Evas_Object *obj) // FIXME: to do animation during state change , we need different signal // so that we can distinguish between state change by user or state change // by calling state_change() api. Keep both the signal for backward compatibility - // and remove "elm,state,check,on" signal emission when we can break ABI. - elm_layout_signal_emit(obj, "elm,activate,check,on", "elm"); - elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); + // and remove "state,check,on" signal emission when we can break ABI. + elm_layout_signal_emit(obj, "activate,check,on", "efl"); + elm_layout_signal_emit(obj, "state,check,on", "efl"); if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF) _elm_access_say(E_("State: On")); } @@ -70,9 +70,9 @@ _activate(Evas_Object *obj) // FIXME: to do animation during state change , we need different signal // so that we can distinguish between state change by user or state change // by calling state_change() api. Keep both the signal for backward compatibility - // and remove "elm,state,check,off" signal emission when we can break ABI. - elm_layout_signal_emit(obj, "elm,activate,check,off", "elm"); - elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); + // and remove "state,check,off" signal emission when we can break ABI. + elm_layout_signal_emit(obj, "activate,check,off", "efl"); + elm_layout_signal_emit(obj, "state,check,off", "efl"); if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF) _elm_access_say(E_("State: Off")); } @@ -128,9 +128,9 @@ _efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUS if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (efl_ui_nstate_value_get(obj) == 0) - elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); + elm_layout_signal_emit(obj, "state,check,off", "efl"); else - elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); + elm_layout_signal_emit(obj, "state,check,on", "efl"); edje_object_message_signal_process(wd->resize_obj); @@ -195,7 +195,7 @@ _on_check_off(void *data, EFL_UI_CHECK_DATA_GET(obj, sd); if (sd->statep) *sd->statep = 0; - elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); + elm_layout_signal_emit(obj, "state,check,off", "efl"); efl_ui_nstate_value_set(obj, 0); if (_elm_config->atspi_mode) @@ -215,7 +215,7 @@ _on_check_on(void *data, EFL_UI_CHECK_DATA_GET(obj, sd); if (sd->statep) *sd->statep = 1; - elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); + elm_layout_signal_emit(obj, "state,check,on", "efl"); efl_ui_nstate_value_set(obj, 1); if (_elm_config->atspi_mode) @@ -247,9 +247,9 @@ _efl_ui_check_selected_set(Eo *obj, Efl_Ui_Check_Data *sd, Eina_Bool value) if (sd->statep) *sd->statep = value; if (value == 1) - elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); + elm_layout_signal_emit(obj, "state,check,on", "efl"); else - elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); + elm_layout_signal_emit(obj, "state,check,off", "efl"); edje_object_message_signal_process(wd->resize_obj); @@ -281,11 +281,11 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); efl_layout_signal_callback_add - (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj); + (wd->resize_obj, "action,check,on", "*", _on_check_on, obj); efl_layout_signal_callback_add - (wd->resize_obj, "elm,action,check,off", "*", _on_check_off, obj); + (wd->resize_obj, "action,check,off", "*", _on_check_off, obj); efl_layout_signal_callback_add - (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj); + (wd->resize_obj, "action,check,toggle", "*", _on_check_toggle, obj); efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX); _elm_access_object_register(obj, wd->resize_obj); @@ -314,9 +314,9 @@ elm_check_state_set(Evas_Object *obj, Eina_Bool state) if (sd->statep) *sd->statep = state; if (state == 1) - elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); + elm_layout_signal_emit(obj, "state,check,on", "efl"); else - elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); + elm_layout_signal_emit(obj, "state,check,off", "efl"); edje_object_message_signal_process(wd->resize_obj); } } @@ -344,9 +344,9 @@ elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep) { nd->state = *sd->statep; if (nd->state == 1) - elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); + elm_layout_signal_emit(obj, "state,check,on", "efl"); else - elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); + elm_layout_signal_emit(obj, "state,check,off", "efl"); } } @@ -402,10 +402,10 @@ _icon_signal_emit(Evas_Object *obj) char buf[64]; if (!elm_widget_resize_object_get(obj)) return; - snprintf(buf, sizeof(buf), "elm,state,icon,%s", + snprintf(buf, sizeof(buf), "state,icon,%s", elm_layout_content_get(obj, "icon") ? "visible" : "hidden"); - elm_layout_signal_emit(obj, buf, "elm"); + elm_layout_signal_emit(obj, buf, "efl"); edje_object_message_signal_process(wd->resize_obj); elm_layout_sizing_eval(obj); diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index 694c0a2492..7d9a11817d 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -396,13 +396,13 @@ _reload_format(Evas_Object *obj) { snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, field->location); - elm_layout_signal_emit(obj, buf, "elm"); + elm_layout_signal_emit(obj, buf, "efl"); } else { snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR, field->location); - elm_layout_signal_emit(obj, buf, "elm"); + elm_layout_signal_emit(obj, buf, "efl"); } if (field->location + 1) { @@ -535,7 +535,7 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) { snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, field->location); - elm_layout_signal_emit(obj, buf, "elm"); + elm_layout_signal_emit(obj, buf, "efl"); if (field->location) { @@ -549,7 +549,7 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) { snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR, field->location); - elm_layout_signal_emit(obj, buf, "elm"); + elm_layout_signal_emit(obj, buf, "efl"); } } @@ -993,7 +993,7 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, field->location); - elm_layout_signal_emit(obj, buf, "elm"); + elm_layout_signal_emit(obj, buf, "efl"); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); edje_object_message_signal_process(wd->resize_obj); @@ -1010,7 +1010,7 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR, field->location); - elm_layout_signal_emit(obj, buf, "elm"); + elm_layout_signal_emit(obj, buf, "efl"); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); edje_object_message_signal_process(wd->resize_obj); diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c index ac13297840..82e5acdbea 100644 --- a/src/lib/elementary/efl_ui_frame.c +++ b/src/lib/elementary/efl_ui_frame.c @@ -82,7 +82,7 @@ _on_frame_clicked(void *data, if (sd->collapsible) { efl_event_callback_add(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data); - elm_layout_signal_emit(data, "elm,action,toggle", "elm"); + elm_layout_signal_emit(data, "action,toggle", "efl"); sd->collapsed++; sd->anim = EINA_TRUE; elm_widget_tree_unfocusable_set(data, sd->collapsed); @@ -116,10 +116,10 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN elm_widget_sub_object_parent_add(obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,anim,done", "elm", + (wd->resize_obj, "anim,done", "efl", _on_recalc_done, obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,action,click", "elm", + (wd->resize_obj, "action,click", "efl", _on_frame_clicked, obj); elm_widget_can_focus_set(obj, EINA_FALSE); @@ -164,7 +164,7 @@ _efl_ui_frame_collapse_set(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse) collapse = !!collapse; if (sd->collapsed == collapse) return; - elm_layout_signal_emit(obj, "elm,action,switch", "elm"); + elm_layout_signal_emit(obj, "action,switch", "efl"); edje_object_message_signal_process(wd->resize_obj); sd->collapsed = !!collapse; sd->anim = EINA_FALSE; @@ -181,7 +181,7 @@ _efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse) collapse = !!collapse; if (sd->collapsed == collapse) return; - elm_layout_signal_emit(obj, "elm,action,toggle", "elm"); + elm_layout_signal_emit(obj, "action,toggle", "efl"); efl_event_callback_legacy_call (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj); sd->collapsed = collapse; diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index bae6834b61..a40499fb87 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -269,7 +269,7 @@ _grid_load(Evas_Object *obj, { edje_object_signal_emit (wd->resize_obj, - "elm,state,busy,start", "elm"); + "state,busy,start", "efl"); efl_event_callback_legacy_call (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); } @@ -281,7 +281,7 @@ _grid_load(Evas_Object *obj, { edje_object_signal_emit (wd->resize_obj, - "elm,state,busy,stop", "elm"); + "state,busy,stop", "efl"); efl_event_callback_legacy_call (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); } @@ -479,7 +479,7 @@ _grid_clear(Evas_Object *obj, { edje_object_signal_emit (wd->resize_obj, - "elm,state,busy,stop", "elm"); + "state,busy,stop", "efl"); efl_event_callback_legacy_call (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); } @@ -511,8 +511,8 @@ _tile_preloaded_cb(void *data, if (!sd->preload_num) { edje_object_signal_emit - (wd->resize_obj, "elm,state,busy,stop", - "elm"); + (wd->resize_obj, "state,busy,stop", + "efl"); efl_event_callback_legacy_call (wd->obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); } @@ -716,7 +716,7 @@ _main_img_preloaded_cb(void *data, if (!sd->preload_num) { edje_object_signal_emit - (wd->resize_obj, "elm,state,busy,stop", "elm"); + (wd->resize_obj, "state,busy,stop", "efl"); efl_event_callback_legacy_call (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); } @@ -873,13 +873,13 @@ _efl_ui_image_zoomable_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Image if (efl_ui_focus_object_focus_get(obj)) { edje_object_signal_emit - (wd->resize_obj, "elm,action,focus", "elm"); + (wd->resize_obj, "action,focus", "efl"); evas_object_focus_set(wd->resize_obj, EINA_TRUE); } else { edje_object_signal_emit - (wd->resize_obj, "elm,action,unfocus", "elm"); + (wd->resize_obj, "action,unfocus", "efl"); evas_object_focus_set(wd->resize_obj, EINA_FALSE); } @@ -1522,9 +1522,9 @@ _efl_ui_image_zoomable_bar_show_cb(void *data, const Efl_Event *event) Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,show,hbar", "efl"); else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,show,vbar", "efl"); } static void @@ -1535,16 +1535,16 @@ _efl_ui_image_zoomable_bar_hide_cb(void *data, const Efl_Event *event) Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,hide,hbar", "efl"); else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,hide,vbar", "efl"); } static void _efl_ui_image_zoomable_edje_object_attach(Eo *obj) { efl_layout_signal_callback_add - (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj); + (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj); efl_layout_signal_callback_add (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb, obj); @@ -1564,10 +1564,10 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj) (obj, "drag,page", "elm.dragable.vbar", _efl_ui_image_zoomable_edje_drag_cb, obj); efl_layout_signal_callback_add - (obj, "elm,vbar,press", "elm", + (obj, "vbar,press", "efl", _efl_ui_image_zoomable_vbar_press_cb, obj); efl_layout_signal_callback_add - (obj, "elm,vbar,unpress", "elm", + (obj, "vbar,unpress", "efl", _efl_ui_image_zoomable_vbar_unpress_cb, obj); efl_layout_signal_callback_add (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb, @@ -1588,10 +1588,10 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj) (obj, "drag,page", "elm.dragable.hbar", _efl_ui_image_zoomable_edje_drag_cb, obj); efl_layout_signal_callback_add - (obj, "elm,hbar,press", "elm", + (obj, "hbar,press", "efl", _efl_ui_image_zoomable_hbar_press_cb, obj); efl_layout_signal_callback_add - (obj, "elm,hbar,unpress", "elm", + (obj, "hbar,unpress", "efl", _efl_ui_image_zoomable_hbar_unpress_cb, obj); } @@ -1599,7 +1599,7 @@ static void _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj) { efl_layout_signal_callback_del - (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj); + (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj); efl_layout_signal_callback_del (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb, obj); @@ -1619,10 +1619,10 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj) (obj, "drag,page", "elm.dragable.vbar", _efl_ui_image_zoomable_edje_drag_cb, obj); efl_layout_signal_callback_del - (obj, "elm,vbar,press", "elm", + (obj, "vbar,press", "efl", _efl_ui_image_zoomable_vbar_press_cb, obj); efl_layout_signal_callback_del - (obj, "elm,vbar,unpress", "elm", + (obj, "vbar,unpress", "efl", _efl_ui_image_zoomable_vbar_unpress_cb, obj); efl_layout_signal_callback_del (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb, @@ -1643,10 +1643,10 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj) (obj, "drag,page", "elm.dragable.hbar", _efl_ui_image_zoomable_edje_drag_cb, obj); efl_layout_signal_callback_del - (obj, "elm,hbar,press", "elm", + (obj, "hbar,press", "efl", _efl_ui_image_zoomable_hbar_press_cb, obj); efl_layout_signal_callback_del - (obj, "elm,hbar,unpress", "elm", + (obj, "hbar,unpress", "efl", _efl_ui_image_zoomable_hbar_unpress_cb, obj); } @@ -1902,7 +1902,7 @@ _img_proxy_set(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd, if (sd->preload_num == 1) { edje_object_signal_emit - (wd->resize_obj, "elm,state,busy,start", "elm"); + (wd->resize_obj, "state,busy,start", "efl"); efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); } @@ -1986,7 +1986,7 @@ _internal_file_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, const char *file, Ei if (sd->preload_num == 1) { edje_object_signal_emit - (wd->resize_obj, "elm,state,busy,start", "elm"); + (wd->resize_obj, "state,busy,start", "efl"); efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); } diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 2de3bbc84e..c4547a802b 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -168,13 +168,14 @@ _signals_emit(Eo *obj, { snprintf(buf, sizeof(buf), "elm,state,%s,%s", type, set ? "visible" : "hidden"); + efl_layout_signal_emit(obj, buf, "elm"); } else { - snprintf(buf, sizeof(buf), "elm,state,%s,%s", type, + snprintf(buf, sizeof(buf), "state,%s,%s", type, set ? "set" : "unset"); + efl_layout_signal_emit(obj, buf, "efl"); } - efl_layout_signal_emit(obj, buf, "elm"); } static inline void @@ -244,6 +245,12 @@ _text_signal_emit(Efl_Ui_Layout_Data *sd, visible ? "elm,state,text,visible" : "elm,state,text,hidden"); efl_layout_signal_emit(sd->obj, buf, "elm"); } + else + { + snprintf(buf, sizeof(buf), + visible ? "state,text,set" : "state,text,unset"); + efl_layout_signal_emit(sd->obj, buf, "efl"); + } /* themes might need immediate action here */ efl_layout_signal_process(sd->obj, EINA_FALSE); @@ -363,12 +370,20 @@ _efl_ui_layout_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd // Not calling efl_super here: Elm.Widget simply returns false. - if (disabled) - edje_object_signal_emit - (wd->resize_obj, "elm,state,disabled", "elm"); + if (elm_widget_is_legacy(obj)) + { + if (disabled) + edje_object_signal_emit(wd->resize_obj, "elm,state,disabled", "elm"); + else + edje_object_signal_emit(wd->resize_obj, "elm,state,enabled", "elm"); + } else - edje_object_signal_emit - (wd->resize_obj, "elm,state,enabled", "elm"); + { + if (disabled) + edje_object_signal_emit(wd->resize_obj, "state,disabled", "efl"); + else + edje_object_signal_emit(wd->resize_obj, "state,enabled", "efl"); + } return EINA_TRUE; } @@ -418,15 +433,31 @@ _efl_ui_layout_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Data * if (!elm_widget_can_focus_get(obj)) return EINA_FALSE; - if (efl_ui_focus_object_focus_get(obj)) + if (elm_widget_is_legacy(obj)) { - elm_layout_signal_emit(obj, "elm,action,focus", "elm"); - evas_object_focus_set(wd->resize_obj, EINA_TRUE); + if (efl_ui_focus_object_focus_get(obj)) + { + elm_layout_signal_emit(obj, "elm,action,focus", "elm"); + evas_object_focus_set(wd->resize_obj, EINA_TRUE); + } + else + { + elm_layout_signal_emit(obj, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->resize_obj, EINA_FALSE); + } } else { - elm_layout_signal_emit(obj, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->resize_obj, EINA_FALSE); + if (efl_ui_focus_object_focus_get(obj)) + { + elm_layout_signal_emit(obj, "action,focus", "elm"); + evas_object_focus_set(wd->resize_obj, EINA_TRUE); + } + else + { + elm_layout_signal_emit(obj, "action,unfocus", "elm"); + evas_object_focus_set(wd->resize_obj, EINA_FALSE); + } } efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS)); @@ -649,7 +680,7 @@ _efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_ elm_widget_can_focus_set(obj, EINA_FALSE); edje_object_signal_callback_add - (edje, "size,eval", "elm", _on_size_evaluate_signal, obj); + (edje, "size,eval", "efl", _on_size_evaluate_signal, obj); elm_layout_sizing_eval(obj); } @@ -1872,7 +1903,10 @@ _view_update(Efl_Ui_Layout_Sub_Connect *sc, const char *property) eina_strbuf_append(buf, sc->name); eina_strbuf_replace_all(buf, "%v", property); - elm_layout_signal_emit(sc->obj, eina_strbuf_string_get(buf), "elm"); + if (elm_widget_is_legacy(sc->obj)) + elm_layout_signal_emit(sc->obj, eina_strbuf_string_get(buf), "elm"); + else + elm_layout_signal_emit(sc->obj, eina_strbuf_string_get(buf), "efl"); eina_strbuf_free(buf); } diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c index 5ec2c27c17..d313cceb83 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry.c +++ b/src/lib/elementary/efl_ui_multibuttonentry.c @@ -388,13 +388,13 @@ _current_item_state_change(Evas_Object *obj, switch (state) { case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED: - elm_layout_signal_emit(VIEW(item), "elm,state,focused", "elm"); + elm_layout_signal_emit(VIEW(item), "state,focused", "efl"); efl_event_callback_legacy_call (obj, EFL_UI_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item)); break; case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT: default: - elm_layout_signal_emit(VIEW(item), "elm,state,default", "elm"); + elm_layout_signal_emit(VIEW(item), "state,default", "efl"); sd->selected_it = NULL; break; } @@ -765,7 +765,7 @@ _item_new(Efl_Ui_Multibuttonentry_Data *sd, elm_layout_signal_callback_add (VIEW(item), "mouse,clicked,1", "*", _on_item_clicked, EO_OBJ(item)); elm_layout_signal_callback_add - (VIEW(item), "elm,deleted", "elm", _on_item_deleted, EO_OBJ(item)); + (VIEW(item), "item,deleted", "efl", _on_item_deleted, EO_OBJ(item)); evas_object_smart_callback_add (VIEW(item), "focused", _on_item_focused, item); evas_object_smart_callback_add @@ -1861,11 +1861,11 @@ _elm_multibuttonentry_item_elm_widget_item_disable(Eo *eo_it, Elm_Multibuttonent { const char* emission; if (elm_wdg_item_disabled_get(eo_it)) - emission = "elm,state,disabled"; + emission = "state,disabled"; else - emission = "elm,state,enabled"; + emission = "state,enabled"; - elm_layout_signal_emit(VIEW(it), emission, "elm"); + elm_layout_signal_emit(VIEW(it), emission, "efl"); } EINA_DEPRECATED EAPI void * @@ -2015,7 +2015,7 @@ static Eina_Bool _key_action_activate(Eo *obj, const char *params EINA_UNUSED) { ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(obj, it); - elm_layout_signal_emit(VIEW(it), "mouse,clicked,1", "elm"); + elm_layout_signal_emit(VIEW(it), "mouse,clicked,1", "efl"); return EINA_TRUE; } @@ -2023,7 +2023,7 @@ static Eina_Bool _key_action_delete(Eo *obj, const char *params EINA_UNUSED) { ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(obj, it); - elm_layout_signal_emit(VIEW(it), "elm,deleted", "elm"); + elm_layout_signal_emit(VIEW(it), "deleted", "efl"); return EINA_TRUE; } diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c index 2f35480ddf..3d8f97220f 100644 --- a/src/lib/elementary/efl_ui_nstate.c +++ b/src/lib/elementary/efl_ui_nstate.c @@ -45,7 +45,7 @@ _efl_ui_nstate_efl_object_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); efl_layout_signal_callback_add - (wd->resize_obj, "elm,action,state,changed", "*", _on_state_changed, obj); + (wd->resize_obj, "action,state,changed", "*", _on_state_changed, obj); //TODO: Add ATSPI call here @@ -64,8 +64,8 @@ _state_signal_emit(Evas_Object *obj, Efl_Ui_Nstate_Data *sd) { char buf[64]; - sprintf(buf, "elm,state,changed,%d", sd->state); - elm_layout_signal_emit(obj, buf, "elm"); + sprintf(buf, "state,changed,%d", sd->state); + elm_layout_signal_emit(obj, buf, "efl"); edje_object_message_signal_process(elm_layout_edje_get(obj)); elm_layout_sizing_eval(obj); } diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index 4548c9036b..4a5f5c2b45 100644 --- a/src/lib/elementary/efl_ui_panes.c +++ b/src/lib/elementary/efl_ui_panes.c @@ -136,11 +136,11 @@ _efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd) if (sd->fixed) { - elm_layout_signal_emit(obj, "elm,panes,fixed", "elm"); + elm_layout_signal_emit(obj, "panes,fixed", "efl"); //TODO: remove this signal on EFL 2.0. // I left this due to the backward compatibility. - elm_layout_signal_emit(obj, "elm.panes.fixed", "elm"); + elm_layout_signal_emit(obj, "elm.panes.fixed", "efl"); } elm_layout_sizing_eval(obj); @@ -416,16 +416,16 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN elm_panes_content_left_size_set(obj, 0.5); edje_object_signal_callback_add - (wd->resize_obj, "elm,action,click", "*", + (wd->resize_obj, "action,click", "*", _on_clicked, obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,action,click,double", "*", + (wd->resize_obj, "action,click,double", "*", _double_clicked, obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,action,press", "*", + (wd->resize_obj, "action,press", "*", _on_pressed, obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,action,unpress", "*", + (wd->resize_obj, "action,unpress", "*", _on_unpressed, obj); evas_object_event_callback_add (wd->resize_obj, EVAS_CALLBACK_RESIZE, @@ -526,19 +526,19 @@ _efl_ui_panes_fixed_set(Eo *obj, Efl_Ui_Panes_Data *sd, Eina_Bool fixed) sd->fixed = !!fixed; if (sd->fixed == EINA_TRUE) { - elm_layout_signal_emit(obj, "elm,panes,fixed", "elm"); + elm_layout_signal_emit(obj, "panes,fixed", "efl"); //TODO: remove this signal on EFL 2.0. // I left this due to the backward compatibility. - elm_layout_signal_emit(obj, "elm.panes.fixed", "elm"); + elm_layout_signal_emit(obj, "elm.panes.fixed", "efl"); } else { - elm_layout_signal_emit(obj, "elm,panes,unfixed", "elm"); + elm_layout_signal_emit(obj, "panes,unfixed", "efl"); //TODO: remove this signal on EFL 2.0. // I left this due to the backward compatibility. - elm_layout_signal_emit(obj, "elm.panes.unfixed", "elm"); + elm_layout_signal_emit(obj, "elm.panes.unfixed", "efl"); } } diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c index e5071daf4a..1256dc7d62 100644 --- a/src/lib/elementary/efl_ui_popup.c +++ b/src/lib/elementary/efl_ui_popup.c @@ -227,7 +227,7 @@ _efl_ui_popup_efl_object_constructor(Eo *obj, Efl_Ui_Popup_Data *pd) evas_object_smart_member_add(pd->backwall, obj); evas_object_stack_below(pd->backwall, wd->resize_obj); - edje_object_signal_callback_add(pd->backwall, "elm,action,clicked", "*", + edje_object_signal_callback_add(pd->backwall, "action,clicked", "*", _backwall_clicked_cb, obj); pd->align = EFL_UI_POPUP_ALIGN_CENTER; @@ -375,12 +375,12 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char Eina_Bool ret = elm_image_file_set(image, file, group); if (!ret) { - edje_object_signal_emit(sd->backwall, "elm,state,image,hidden", "elm"); + edje_object_signal_emit(sd->backwall, "state,image,hidden", "efl"); efl_del(image); return EINA_FALSE; } edje_object_part_swallow(sd->backwall, "elm.swallow.image", image); - edje_object_signal_emit(sd->backwall, "elm,state,image,visible", "elm"); + edje_object_signal_emit(sd->backwall, "state,image,visible", "efl"); return EINA_TRUE; } diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c index 25ba2208fe..186a691495 100644 --- a/src/lib/elementary/efl_ui_popup_alert.c +++ b/src/lib/elementary/efl_ui_popup_alert.c @@ -33,9 +33,9 @@ _efl_ui_popup_alert_text_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, const char *p { efl_text_set(efl_part(efl_super(obj, MY_CLASS), "title"), label); if (label) - elm_layout_signal_emit(obj, "elm,title,show", "elm"); + elm_layout_signal_emit(obj, "title,show", "efl"); else - elm_layout_signal_emit(obj, "elm,title,hide", "elm"); + elm_layout_signal_emit(obj, "title,hide", "efl"); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); edje_object_message_signal_process(wd->resize_obj); @@ -168,7 +168,7 @@ _efl_ui_popup_alert_button_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, Efl_Ui_Popu pd->button[EFL_UI_POPUP_ALERT_BUTTON_NEGATIVE]); } - elm_layout_signal_emit(obj, "elm,buttons,show", "elm"); + elm_layout_signal_emit(obj, "buttons,show", "efl"); edje_object_message_signal_process(wd->resize_obj); elm_layout_sizing_eval(obj); } diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 5d40038c31..163b788ed2 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -239,15 +239,15 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data * if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (sd->pulse) - elm_layout_signal_emit(obj, "elm,state,pulse", "elm"); + elm_layout_signal_emit(obj, "state,pulse", "efl"); else - elm_layout_signal_emit(obj, "elm,state,fraction", "elm"); + elm_layout_signal_emit(obj, "state,fraction", "efl"); if (sd->pulse_state) - elm_layout_signal_emit(obj, "elm,state,pulse,start", "elm"); + elm_layout_signal_emit(obj, "state,pulse,start", "efl"); if (sd->format_cb && (!sd->pulse)) - elm_layout_signal_emit(obj, "elm,state,units,visible", "elm"); + elm_layout_signal_emit(obj, "state,units,visible", "efl"); if (_is_horizontal(sd->dir)) evas_object_size_hint_min_set @@ -259,9 +259,9 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data * elm_config_scale_get()); if (_is_inverted(sd->dir)) - elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm"); + elm_layout_signal_emit(obj, "state,inverted,on", "efl"); else - elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm"); + elm_layout_signal_emit(obj, "state,inverted,off", "efl"); _units_set(obj); _val_set(obj); @@ -566,7 +566,7 @@ _efl_ui_progressbar_efl_ui_format_format_cb_set(Eo *obj, Efl_Ui_Progressbar_Data sd->format_free_cb = func_free_cb; if (!sd->format_strbuf) sd->format_strbuf = eina_strbuf_new(); - elm_layout_signal_emit(obj, "elm,state,units,visible", "elm"); + elm_layout_signal_emit(obj, "state,units,visible", "efl"); edje_object_message_signal_process(wd->resize_obj); _units_set(obj); @@ -582,9 +582,9 @@ _efl_ui_progressbar_pulse_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Eina_Bool st sd->pulse_state = state; if (sd->pulse_state) - elm_layout_signal_emit(obj, "elm,state,pulse,start", "elm"); + elm_layout_signal_emit(obj, "state,pulse,start", "efl"); else - elm_layout_signal_emit(obj, "elm,state,pulse,stop", "elm"); + elm_layout_signal_emit(obj, "state,pulse,stop", "efl"); } EOLIAN static Eina_Bool @@ -722,10 +722,10 @@ _icon_signal_emit(Evas_Object *obj) char buf[64]; if (!elm_widget_resize_object_get(obj)) return; - snprintf(buf, sizeof(buf), "elm,state,icon,%s", + snprintf(buf, sizeof(buf), "state,icon,%s", elm_layout_content_get(obj, "icon") ? "visible" : "hidden"); - elm_layout_signal_emit(obj, buf, "elm"); + elm_layout_signal_emit(obj, buf, "efl"); edje_object_message_signal_process(elm_layout_edje_get(obj)); elm_layout_sizing_eval(obj); } diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index 5cae7ec113..a49831aa2c 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -54,18 +54,18 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate) // FIXME: to do animation during state change , we need different signal // so that we can distinguish between state change by user or state change // by calling state_change() api. Keep both the signal for backward compatibility - // and only emit "elm,state,radio,on" when activate is false when we can break ABI. - if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,on", "elm"); - elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); + // and only emit "state,radio,on" when activate is false when we can break ABI. + if (activate) elm_layout_signal_emit(obj, "activate,radio,on", "efl"); + elm_layout_signal_emit(obj, "state,radio,on", "efl"); } else { // FIXME: to do animation during state change , we need different signal // so that we can distinguish between state change by user or state change // by calling state_change() api. Keep both the signal for backward compatibility - // and only emit "elm,state,radio,off"when activate is false when we can break ABI. - if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,off", "elm"); - elm_layout_signal_emit(obj, "elm,state,radio,off", "elm"); + // and only emit "state,radio,off"when activate is false when we can break ABI. + if (activate) elm_layout_signal_emit(obj, "activate,radio,off", "efl"); + elm_layout_signal_emit(obj, "state,radio,off", "efl"); } if (_elm_config->atspi_mode) { @@ -138,8 +138,8 @@ _efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd) int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; - if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); - else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm"); + if (sd->state) elm_layout_signal_emit(obj, "state,radio,on", "efl"); + else elm_layout_signal_emit(obj, "state,radio,off", "efl"); edje_object_message_signal_process(wd->resize_obj); @@ -189,7 +189,7 @@ _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *pd) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); elm_layout_signal_callback_add - (obj, "elm,action,radio,toggle", "*", _radio_on_cb, obj); + (obj, "action,radio,toggle", "*", _radio_on_cb, obj); pd->group = calloc(1, sizeof(Group)); pd->group->radios = eina_list_append(pd->group->radios, obj); @@ -375,10 +375,10 @@ _icon_signal_emit(Evas_Object *obj) edje = elm_widget_resize_object_get(obj); if (!edje) return; - snprintf(buf, sizeof(buf), "elm,state,icon,%s", + snprintf(buf, sizeof(buf), "state,icon,%s", elm_layout_content_get(obj, "icon") ? "visible" : "hidden"); - elm_layout_signal_emit(obj, buf, "elm"); + elm_layout_signal_emit(obj, buf, "efl"); edje_object_message_signal_process(edje); elm_layout_sizing_eval(obj); } diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c index 43885baf96..2694ec66ea 100644 --- a/src/lib/elementary/efl_ui_scroller.c +++ b/src/lib/elementary/efl_ui_scroller.c @@ -233,9 +233,9 @@ _efl_ui_scroller_bar_show_cb(void *data, const Efl_Event *event) Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,show,hbar", "efl"); else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,show,vbar", "efl"); } static void @@ -247,9 +247,9 @@ _efl_ui_scroller_bar_hide_cb(void *data, const Efl_Event *event) Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,hide,hbar", "efl"); else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,hide,vbar", "efl"); } static void @@ -258,7 +258,7 @@ _scroll_edje_object_attach(Eo *obj) EFL_UI_SCROLLER_DATA_GET_OR_RETURN(obj, sd); efl_layout_signal_callback_add - (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj); + (obj, "reload", "efl", _efl_ui_scroller_reload_cb, obj); efl_layout_signal_callback_add (obj, "drag", "elm.dragable.vbar", _efl_ui_scroller_vbar_drag_cb, obj); @@ -278,10 +278,10 @@ _scroll_edje_object_attach(Eo *obj) (obj, "drag,page", "elm.dragable.vbar", _efl_ui_scroller_edje_drag_cb, obj); efl_layout_signal_callback_add - (obj, "elm,vbar,press", "elm", + (obj, "vbar,press", "efl", _efl_ui_scroller_vbar_press_cb, obj); efl_layout_signal_callback_add - (obj, "elm,vbar,unpress", "elm", + (obj, "vbar,unpress", "efl", _efl_ui_scroller_vbar_unpress_cb, obj); efl_layout_signal_callback_add (obj, "drag", "elm.dragable.hbar", _efl_ui_scroller_hbar_drag_cb, @@ -302,10 +302,10 @@ _scroll_edje_object_attach(Eo *obj) (obj, "drag,page", "elm.dragable.hbar", _efl_ui_scroller_edje_drag_cb, obj); efl_layout_signal_callback_add - (obj, "elm,hbar,press", "elm", + (obj, "hbar,press", "efl", _efl_ui_scroller_hbar_press_cb, obj); efl_layout_signal_callback_add - (obj, "elm,hbar,unpress", "elm", + (obj, "hbar,unpress", "efl", _efl_ui_scroller_hbar_unpress_cb, obj); } @@ -315,7 +315,7 @@ _scroll_edje_object_detach(Evas_Object *obj) EFL_UI_SCROLLER_DATA_GET_OR_RETURN(obj, sd); efl_layout_signal_callback_del - (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj); + (obj, "reload", "efl", _efl_ui_scroller_reload_cb, obj); efl_layout_signal_callback_del (obj, "drag", "elm.dragable.vbar", _efl_ui_scroller_vbar_drag_cb, obj); @@ -335,10 +335,10 @@ _scroll_edje_object_detach(Evas_Object *obj) (obj, "drag,page", "elm.dragable.vbar", _efl_ui_scroller_edje_drag_cb, obj); efl_layout_signal_callback_del - (obj, "elm,vbar,press", "elm", + (obj, "vbar,press", "efl", _efl_ui_scroller_vbar_press_cb, obj); efl_layout_signal_callback_del - (obj, "elm,vbar,unpress", "elm", + (obj, "vbar,unpress", "efl", _efl_ui_scroller_vbar_unpress_cb, obj); efl_layout_signal_callback_del (obj, "drag", "elm.dragable.hbar", _efl_ui_scroller_hbar_drag_cb, @@ -359,10 +359,10 @@ _scroll_edje_object_detach(Evas_Object *obj) (obj, "drag,page", "elm.dragable.hbar", _efl_ui_scroller_edje_drag_cb, obj); efl_layout_signal_callback_del - (obj, "elm,hbar,press", "elm", + (obj, "hbar,press", "efl", _efl_ui_scroller_hbar_press_cb, obj); efl_layout_signal_callback_del - (obj, "elm,hbar,unpress", "elm", + (obj, "hbar,unpress", "efl", _efl_ui_scroller_hbar_unpress_cb, obj); } diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index c02564bbb3..5b33041ad8 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -233,7 +233,10 @@ _units_set(Evas_Object *obj) if (!sd->units_show) { - elm_layout_signal_emit(obj, "elm,state,units,visible", "elm"); + if (elm_widget_is_legacy(obj)) + elm_layout_signal_emit(obj, "elm,state,units,visible", "elm"); + else + elm_layout_signal_emit(obj, "state,units,visible", "efl"); sd->units_show = EINA_TRUE; } @@ -244,7 +247,10 @@ _units_set(Evas_Object *obj) elm_layout_text_set(obj, "elm.units", NULL); if (sd->units_show) { - elm_layout_signal_emit(obj, "elm,state,units,hidden", "elm"); + if (elm_widget_is_legacy(obj)) + elm_layout_signal_emit(obj, "elm,state,units,hidden", "elm"); + else + elm_layout_signal_emit(obj, "state,units,hidden", "efl"); sd->units_show = EINA_FALSE; } } @@ -384,16 +390,20 @@ _popup_show(void *data, evas_object_raise(sd->popup); evas_object_show(sd->popup); sd->popup_visible = EINA_TRUE; - edje_object_signal_emit(sd->popup, "popup,show", "elm"); // XXX: for compat - edje_object_signal_emit(sd->popup, "elm,popup,show", "elm"); + if (elm_widget_is_legacy(obj)) + edje_object_signal_emit(sd->popup, "elm,popup,show", "elm"); + else + edje_object_signal_emit(sd->popup, "popup,show", "efl"); } if (sd->popup2 && (sd->indicator_visible_mode != ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE)) { evas_object_raise(sd->popup2); evas_object_show(sd->popup2); - edje_object_signal_emit(sd->popup2, "popup,show", "elm"); // XXX: for compat - edje_object_signal_emit(sd->popup2, "elm,popup,show", "elm"); + if (elm_widget_is_legacy(obj)) + edje_object_signal_emit(sd->popup2, "elm,popup,show", "elm"); + else + edje_object_signal_emit(sd->popup2, "popup,show", "efl"); } ELM_SAFE_FREE(sd->wheel_indicator_timer, ecore_timer_del); } @@ -413,13 +423,17 @@ _popup_hide(void *data, efl_ui_focus_object_focus_get(data)) return; - edje_object_signal_emit(sd->popup, "popup,hide", "elm"); // XXX: for compat - edje_object_signal_emit(sd->popup, "elm,popup,hide", "elm"); + if (elm_widget_is_legacy(obj)) + edje_object_signal_emit(sd->popup, "elm,popup,hide", "elm"); + else + edje_object_signal_emit(sd->popup, "popup,hide", "efl"); if (sd->popup2) { - edje_object_signal_emit(sd->popup2, "popup,hide", "elm"); // XXX: for compat - edje_object_signal_emit(sd->popup2, "elm,popup,hide", "elm"); + if (elm_widget_is_legacy(obj)) + edje_object_signal_emit(sd->popup2, "elm,popup,hide", "elm"); + else + edje_object_signal_emit(sd->popup2, "popup,hide", "efl"); } } @@ -657,15 +671,30 @@ _popup_update(Evas_Object *obj, Efl_Ui_Slider_Data *sd, Evas_Object *popup) edje_object_scale_set(popup, efl_gfx_scale_get(obj) * elm_config_scale_get()); - if (!_is_inverted(sd->dir)) - edje_object_signal_emit(popup, "elm,state,inverted,off", "elm"); - else - edje_object_signal_emit(popup, "elm,state,inverted,on", "elm"); + if (elm_widget_is_legacy(obj)) + { + if (!_is_inverted(sd->dir)) + edje_object_signal_emit(popup, "elm,state,inverted,off", "elm"); + else + edje_object_signal_emit(popup, "elm,state,inverted,on", "elm"); - if (sd->indicator_show) - edje_object_signal_emit(popup, "elm,state,val,show", "elm"); + if (sd->indicator_show) + edje_object_signal_emit(popup, "elm,state,val,show", "elm"); + else + edje_object_signal_emit(popup, "elm,state,val,hide", "elm"); + } else - edje_object_signal_emit(popup, "elm,state,val,hide", "elm"); + { + if (!_is_inverted(sd->dir)) + edje_object_signal_emit(popup, "state,inverted,off", "efl"); + else + edje_object_signal_emit(popup, "state,inverted,on", "efl"); + + if (sd->indicator_show) + edje_object_signal_emit(popup, "state,val,show", "efl"); + else + edje_object_signal_emit(popup, "state,val,hide", "efl"); + } } static void @@ -683,10 +712,16 @@ _popup_add(Efl_Ui_Slider_Data *sd, Eo *obj, Evas_Object **popup, // XXX popup needs to adapt to theme etc. *popup = edje_object_add(evas_object_evas_get(obj)); evas_object_smart_member_add(*popup, obj); - edje_object_signal_callback_add(*popup, "popup,hide,done", "elm", // XXX: for compat - _popup_hide_done, obj); - edje_object_signal_callback_add(*popup, "elm,popup,hide,done", "elm", - _popup_hide_done, obj); + if (elm_widget_is_legacy(obj)) + { + edje_object_signal_callback_add(*popup, "elm,popup,hide,done", "elm", + _popup_hide_done, obj); + } + else + { + edje_object_signal_callback_add(*popup, "popup,hide,done", "efl", + _popup_hide_done, obj); + } _popup_update(obj, sd, *popup); @@ -797,22 +832,39 @@ _efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd) (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get()); - if (sd->intvl_enable) - elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm"); - else - elm_layout_signal_emit(obj, "elm,slider,range,disable", "elm"); + if (elm_widget_is_legacy(obj)) + { + if (sd->intvl_enable) + elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm"); + else + elm_layout_signal_emit(obj, "elm,slider,range,disable", "elm"); - if (_is_inverted(sd->dir)) - elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm"); - else - elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm"); + if (_is_inverted(sd->dir)) + elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm"); + else + elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm"); - if (sd->indicator_show) - elm_layout_signal_emit(obj, "elm,state,val,show", "elm"); + if (sd->indicator_show) + elm_layout_signal_emit(obj, "elm,state,val,show", "elm"); + } else - elm_layout_signal_emit(obj, "elm,state,val,hide", "elm"); + { + if (sd->intvl_enable) + elm_layout_signal_emit(obj, "slider,range,enable", "efl"); + else + elm_layout_signal_emit(obj, "slider,range,disable", "efl"); + + if (_is_inverted(sd->dir)) + elm_layout_signal_emit(obj, "state,inverted,on", "efl"); + else + elm_layout_signal_emit(obj, "state,inverted,off", "efl"); + + if (sd->indicator_show) + elm_layout_signal_emit(obj, "state,val,show", "efl"); + else + elm_layout_signal_emit(obj, "state,val,hide", "efl"); + } - if (!sd->popup) _popup_add(sd, obj, &sd->popup, &sd->track, sd->intvl_enable); else @@ -939,7 +991,11 @@ _spacer_down_cb(void *data, elm_object_focus_set(data, EINA_TRUE); _slider_update(data, EINA_TRUE); efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL); - elm_layout_signal_emit(data, "elm,state,indicator,show", "elm"); + if (elm_widget_is_legacy(data)) + elm_layout_signal_emit(data, "elm,state,indicator,show", "elm"); + else + elm_layout_signal_emit(data, "state,indicator,show", "efl"); + } static void @@ -983,7 +1039,12 @@ _spacer_move_cb(void *data, elm_widget_scroll_freeze_pop(data); sd->frozen = EINA_FALSE; } - elm_layout_signal_emit(data, "elm,state,indicator,hide", "elm"); + + if (elm_widget_is_legacy(data)) + elm_layout_signal_emit(data, "elm,state,indicator,hide", "elm"); + else + elm_layout_signal_emit(data, "state,indicator,hide", "efl"); + elm_slider_value_set(data, sd->val2); return; } @@ -1024,7 +1085,10 @@ _spacer_up_cb(void *data, elm_widget_scroll_freeze_pop(data); sd->frozen = EINA_FALSE; } - elm_layout_signal_emit(data, "elm,state,indicator,hide", "elm"); + if (elm_widget_is_legacy(data)) + elm_layout_signal_emit(data, "elm,state,indicator,hide", "elm"); + else + elm_layout_signal_emit(data, "state,indicator,hide", "efl"); } static void @@ -1152,10 +1216,10 @@ _efl_ui_slider_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Slider_Data *priv) elm_layout_signal_callback_add(obj, "drag,stop", "*", _drag_stop, obj); elm_layout_signal_callback_add(obj, "drag,step", "*", _drag_step, obj); elm_layout_signal_callback_add(obj, "drag,page", "*", _drag_stop, obj); - elm_layout_signal_callback_add(obj, "popup,show", "elm", _popup_show, obj); // XXX: for compat - elm_layout_signal_callback_add(obj, "popup,hide", "elm", _popup_hide, obj); // XXX: for compat - elm_layout_signal_callback_add(obj, "elm,popup,show", "elm", _popup_show, obj); - elm_layout_signal_callback_add(obj, "elm,popup,hide", "elm", _popup_hide, obj); + elm_layout_signal_callback_add(obj, "popup,show", "efl", _popup_show, obj); // XXX: for compat + elm_layout_signal_callback_add(obj, "popup,hide", "efl", _popup_hide, obj); // XXX: for compat + elm_layout_signal_callback_add(obj, "popup,show", "efl", _popup_show, obj); + elm_layout_signal_callback_add(obj, "popup,hide", "efl", _popup_hide, obj); elm_layout_signal_callback_add(obj, "*", "popup,emit", _popup_emit, obj); edje_object_part_drag_value_set (wd->resize_obj, "elm.dragable.slider", 0.0, 0.0); @@ -1362,12 +1426,25 @@ _efl_ui_slider_efl_ui_format_format_cb_set(Eo *obj, Efl_Ui_Slider_Data *sd, void sd->format_free_cb = func_free_cb; if (!sd->format_strbuf) sd->format_strbuf = eina_strbuf_new(); - elm_layout_signal_emit(obj, "elm,state,units,visible", "elm"); + if (elm_widget_is_legacy(obj)) + elm_layout_signal_emit(obj, "elm,state,units,visible", "elm"); + else + elm_layout_signal_emit(obj, "state,units,visible", "efl"); edje_object_message_signal_process(wd->resize_obj); - if (sd->popup) - edje_object_signal_emit(sd->popup, "elm,state,units,visible", "elm"); - if (sd->popup2) - edje_object_signal_emit(sd->popup2, "elm,state,units,visible", "elm"); + if (elm_widget_is_legacy(obj)) + { + if (sd->popup) + edje_object_signal_emit(sd->popup, "elm,state,units,visible", "elm"); + if (sd->popup2) + edje_object_signal_emit(sd->popup2, "elm,state,units,visible", "elm"); + } + else + { + if (sd->popup) + edje_object_signal_emit(sd->popup, "state,units,visible", "efl"); + if (sd->popup2) + edje_object_signal_emit(sd->popup2, "state,units,visible", "efl"); + } efl_canvas_group_change(obj); } @@ -1400,21 +1477,43 @@ _slider_span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, int size) if (sd->size == size) return; sd->size = size; - if (sd->indicator_show) + if (elm_widget_is_legacy(obj)) { - elm_layout_signal_emit(obj, "elm,state,val,show", "elm"); - if (sd->popup) - edje_object_signal_emit(sd->popup, "elm,state,val,show", "elm"); - if (sd->popup2) - edje_object_signal_emit(sd->popup2, "elm,state,val,show", "elm"); + if (sd->indicator_show) + { + elm_layout_signal_emit(obj, "elm,state,val,show", "elm"); + if (sd->popup) + edje_object_signal_emit(sd->popup, "elm,state,val,show", "elm"); + if (sd->popup2) + edje_object_signal_emit(sd->popup2, "elm,state,val,show", "elm"); + } + else + { + elm_layout_signal_emit(obj, "elm,state,val,hide", "elm"); + if (sd->popup) + edje_object_signal_emit(sd->popup, "elm,state,val,hide", "elm"); + if (sd->popup2) + edje_object_signal_emit(sd->popup2, "elm,state,val,hide", "elm"); + } } else { - elm_layout_signal_emit(obj, "elm,state,val,hide", "elm"); - if (sd->popup) - edje_object_signal_emit(sd->popup, "elm,state,val,hide", "elm"); - if (sd->popup2) - edje_object_signal_emit(sd->popup2, "elm,state,val,hide", "elm"); + if (sd->indicator_show) + { + elm_layout_signal_emit(obj, "state,val,show", "efl"); + if (sd->popup) + edje_object_signal_emit(sd->popup, "state,val,show", "efl"); + if (sd->popup2) + edje_object_signal_emit(sd->popup2, "state,val,show", "efl"); + } + else + { + elm_layout_signal_emit(obj, "state,val,hide", "efl"); + if (sd->popup) + edje_object_signal_emit(sd->popup, "state,val,hide", "efl"); + if (sd->popup2) + edje_object_signal_emit(sd->popup2, "state,val,hide", "efl"); + } } evas_object_smart_changed(obj); @@ -1692,18 +1791,34 @@ elm_slider_range_enabled_set(Evas_Object *obj, Eina_Bool enable) sd->intvl_enable = enable; efl_ui_widget_theme_apply(obj); - if (sd->intvl_enable) + if (elm_widget_is_legacy(obj)) { - elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm"); - if (sd->indicator_show) - edje_object_signal_emit(sd->popup2, "elm,state,val,show", "elm"); + if (sd->intvl_enable) + { + elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm"); + if (sd->indicator_show) + edje_object_signal_emit(sd->popup2, "elm,state,val,show", "elm"); + } + else + { + elm_layout_signal_emit(obj, "elm,slider,range,disable", "elm"); + ELM_SAFE_FREE(sd->popup2, evas_object_del); + } } else { - elm_layout_signal_emit(obj, "elm,slider,range,disable", "elm"); - ELM_SAFE_FREE(sd->popup2, evas_object_del); + if (sd->intvl_enable) + { + elm_layout_signal_emit(obj, "slider,range,enable", "efl"); + if (sd->indicator_show) + edje_object_signal_emit(sd->popup2, "state,val,show", "efl"); + } + else + { + elm_layout_signal_emit(obj, "slider,range,disable", "efl"); + ELM_SAFE_FREE(sd->popup2, evas_object_del); + } } - } EAPI Eina_Bool @@ -1792,23 +1907,47 @@ elm_slider_indicator_show_set(Evas_Object *obj, Eina_Bool show) { EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd); - if (show) + if (elm_widget_is_legacy(obj)) { - sd->indicator_show = EINA_TRUE; - elm_layout_signal_emit(obj, "elm,state,val,show", "elm"); - if (sd->popup) - edje_object_signal_emit(sd->popup, "elm,state,val,show", "elm"); - if (sd->popup2) - edje_object_signal_emit(sd->popup2, "elm,state,val,show", "elm"); + if (show) + { + sd->indicator_show = EINA_TRUE; + elm_layout_signal_emit(obj, "elm,state,val,show", "elm"); + if (sd->popup) + edje_object_signal_emit(sd->popup, "elm,state,val,show", "elm"); + if (sd->popup2) + edje_object_signal_emit(sd->popup2, "elm,state,val,show", "elm"); + } + else + { + sd->indicator_show = EINA_FALSE; + elm_layout_signal_emit(obj, "elm,state,val,hide", "elm"); + if (sd->popup) + edje_object_signal_emit(sd->popup, "elm,state,val,hide", "elm"); + if (sd->popup2) + edje_object_signal_emit(sd->popup2, "elm,state,val,hide", "elm"); + } } else { - sd->indicator_show = EINA_FALSE; - elm_layout_signal_emit(obj, "elm,state,val,hide", "elm"); - if (sd->popup) - edje_object_signal_emit(sd->popup, "elm,state,val,hide", "elm"); - if (sd->popup2) - edje_object_signal_emit(sd->popup2, "elm,state,val,hide", "elm"); + if (show) + { + sd->indicator_show = EINA_TRUE; + elm_layout_signal_emit(obj, "state,val,show", "efl"); + if (sd->popup) + edje_object_signal_emit(sd->popup, "state,val,show", "efl"); + if (sd->popup2) + edje_object_signal_emit(sd->popup2, "state,val,show", "efl"); + } + else + { + sd->indicator_show = EINA_FALSE; + elm_layout_signal_emit(obj, "state,val,hide", "efl"); + if (sd->popup) + edje_object_signal_emit(sd->popup, "state,val,hide", "efl"); + if (sd->popup2) + edje_object_signal_emit(sd->popup2, "state,val,hide", "efl"); + } } evas_object_smart_changed(obj); diff --git a/src/lib/elementary/efl_ui_slider_interval.c b/src/lib/elementary/efl_ui_slider_interval.c index 17b86c2409..cc8bdb4ef9 100644 --- a/src/lib/elementary/efl_ui_slider_interval.c +++ b/src/lib/elementary/efl_ui_slider_interval.c @@ -110,9 +110,9 @@ _efl_ui_slider_interval_efl_object_finalize(Eo *obj, void *sd EINA_UNUSED) elm_widget_theme_klass_set(obj, "slider_interval"); efl_ui_widget_theme_apply(obj); - elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm"); + elm_layout_signal_emit(obj, "slider,range,enable", "efl"); if (pd->indicator_show) - edje_object_signal_emit(pd->popup2, "elm,state,val,show", "elm"); + edje_object_signal_emit(pd->popup2, "state,val,show", "efl"); obj = efl_finalize(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c index 64144176b3..dab51da871 100644 --- a/src/lib/elementary/efl_ui_spin_button.c +++ b/src/lib/elementary/efl_ui_spin_button.c @@ -156,8 +156,8 @@ _entry_hide(Evas_Object *obj) { Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS); - elm_layout_signal_emit(obj, "elm,state,button,active", "elm"); - elm_layout_signal_emit(obj, "elm,state,entry,inactive", "elm"); + elm_layout_signal_emit(obj, "state,button,active", "efl"); + elm_layout_signal_emit(obj, "state,entry,inactive", "efl"); if (sd->entry_visible && !evas_focus_state_get(evas_object_evas_get(obj))) sd->entry_reactivate = EINA_TRUE; @@ -339,7 +339,7 @@ _entry_show_cb(void *data, elm_object_focus_set(obj, EINA_TRUE); elm_entry_select_all(obj); sd->entry_visible = EINA_TRUE; - elm_layout_signal_emit(data, "elm,state,button,inactive", "elm"); + elm_layout_signal_emit(data, "state,button,inactive", "efl"); } static void @@ -377,7 +377,7 @@ _toggle_entry(Evas_Object *obj) efl_event_callback_add(sd->ent, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _entry_focus_changed_cb, obj); sd->entry_visible = EINA_TRUE; - elm_layout_signal_emit(obj, "elm,state,entry,active", "elm"); + elm_layout_signal_emit(obj, "state,entry,active", "efl"); { Eina_List *items = NULL; @@ -657,13 +657,13 @@ _access_increment_decrement_info_say(Evas_Object *obj, if (is_incremented) { elm_object_signal_emit - (sd->inc_button, "elm,action,anim,activate", "elm"); + (sd->inc_button, "action,anim,activate", "efl"); eina_strbuf_append(buf, E_("incremented")); } else { elm_object_signal_emit - (sd->dec_button, "elm,action,anim,activate", "elm"); + (sd->dec_button, "action,anim,activate", "efl"); eina_strbuf_append(buf, E_("decremented")); } @@ -687,10 +687,10 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access) /* unregister access */ _elm_access_edje_object_part_object_unregister (obj, elm_layout_edje_get(obj), "access"); - elm_layout_signal_emit(obj, "elm,state,access,inactive", "elm"); + elm_layout_signal_emit(obj, "state,access,inactive", "efl"); return; } - elm_layout_signal_emit(obj, "elm,state,access,active", "elm"); + elm_layout_signal_emit(obj, "state,access,active", "efl"); ao = _elm_access_edje_object_part_object_register (obj, elm_layout_edje_get(obj), "access"); @@ -788,7 +788,7 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd) } elm_layout_signal_callback_add - (obj, "elm,action,entry,toggle", "*", _entry_toggle_cb, NULL); + (obj, "action,entry,toggle", "*", _entry_toggle_cb, NULL); elm_widget_can_focus_set(obj, EINA_TRUE); diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index b8fa0ea20e..1310204290 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -444,9 +444,9 @@ _efl_ui_text_guide_update(Evas_Object *obj, EFL_UI_TEXT_DATA_GET(obj, sd); if ((has_text) && (!sd->has_text)) - edje_object_signal_emit(sd->entry_edje, "elm,guide,disabled", "elm"); + edje_object_signal_emit(sd->entry_edje, "guide,disabled", "efl"); else if ((!has_text) && (sd->has_text)) - edje_object_signal_emit(sd->entry_edje, "elm,guide,enabled", "elm"); + edje_object_signal_emit(sd->entry_edje, "guide,enabled", "efl"); sd->has_text = has_text; } @@ -465,7 +465,7 @@ _validate(Evas_Object *obj) res = efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc); buf = eina_strbuf_new(); eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass"); - edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm"); + edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "efl"); eina_tmpstr_del(vc.signal); eina_strbuf_free(buf); } @@ -515,12 +515,12 @@ _hide_selection_handler(Evas_Object *obj) if (sd->start_handler_shown) { - edje_object_signal_emit(sd->start_handler, "elm,handler,hide", "elm"); + edje_object_signal_emit(sd->start_handler, "handler,hide", "efl"); sd->start_handler_shown = EINA_FALSE; } if (sd->end_handler_shown) { - edje_object_signal_emit(sd->end_handler, "elm,handler,hide", "elm"); + edje_object_signal_emit(sd->end_handler, "handler,hide", "efl"); sd->end_handler_shown = EINA_FALSE; } } @@ -606,13 +606,13 @@ _update_selection_handler(Eo *obj) if (!sd->start_handler_shown && !hidden) { edje_object_signal_emit(sd->start_handler, - "elm,handler,show", "elm"); + "handler,show", "efl"); sd->start_handler_shown = EINA_TRUE; } else if (sd->start_handler_shown && hidden) { edje_object_signal_emit(sd->start_handler, - "elm,handler,hide", "elm"); + "handler,hide", "efl"); sd->start_handler_shown = EINA_FALSE; } @@ -632,13 +632,13 @@ _update_selection_handler(Eo *obj) if (!sd->end_handler_shown && !hidden) { edje_object_signal_emit(sd->end_handler, - "elm,handler,show", "elm"); + "handler,show", "efl"); sd->end_handler_shown = EINA_TRUE; } else if (sd->end_handler_shown && hidden) { edje_object_signal_emit(sd->end_handler, - "elm,handler,hide", "elm"); + "handler,hide", "efl"); sd->end_handler_shown = EINA_FALSE; } eina_rectangle_free(rect); @@ -648,13 +648,13 @@ _update_selection_handler(Eo *obj) if (sd->start_handler_shown) { edje_object_signal_emit(sd->start_handler, - "elm,handler,hide", "elm"); + "handler,hide", "efl"); sd->start_handler_shown = EINA_FALSE; } if (sd->end_handler_shown) { edje_object_signal_emit(sd->end_handler, - "elm,handler,hide", "elm"); + "handler,hide", "efl"); sd->end_handler_shown = EINA_FALSE; } } @@ -804,11 +804,11 @@ _efl_ui_text_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Text_Data *sd, Ein _dnd_pos_cb, NULL, _dnd_drop_cb, NULL); - emission = disabled ? "elm,state,disabled" : "elm,state,enabled"; - edje_object_signal_emit(sd->entry_edje, emission, "elm"); + emission = disabled ? "state,disabled" : "state,enabled"; + edje_object_signal_emit(sd->entry_edje, emission, "efl"); if (sd->scroll) { - edje_object_signal_emit(sd->scr_edje, emission, "elm"); + edje_object_signal_emit(sd->scr_edje, emission, "efl"); elm_interface_scrollable_freeze_set(obj, disabled); } sd->disabled = disabled; @@ -881,7 +881,7 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) elm_widget_theme_element_get(obj)); if (elm_widget_disabled_get(obj)) - edje_object_signal_emit(sd->entry_edje, "elm,state,disabled", "elm"); + edje_object_signal_emit(sd->entry_edje, "state,disabled", "efl"); edje_object_part_text_input_panel_layout_set (sd->entry_edje, "elm.text", (Edje_Input_Panel_Layout)sd->input_panel_layout); @@ -912,9 +912,9 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) if (efl_ui_focus_object_focus_get(obj)) { - edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm"); + edje_object_signal_emit(sd->entry_edje, "action,focus", "efl"); if (sd->scroll) - edje_object_signal_emit(sd->scr_edje, "elm,action,focus", "elm"); + edje_object_signal_emit(sd->scr_edje, "action,focus", "efl"); } edje_object_message_signal_process(sd->entry_edje); @@ -1144,9 +1144,9 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd) Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); evas_object_focus_set(sw, EINA_TRUE); - _edje_signal_emit(sd, "elm,action,focus", "elm"); + _edje_signal_emit(sd, "action,focus", "efl"); if (sd->scroll) - edje_object_signal_emit(sd->scr_edje, "elm,action,focus", "elm"); + edje_object_signal_emit(sd->scr_edje, "action,focus", "efl"); if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); @@ -1159,9 +1159,9 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd) { Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); - _edje_signal_emit(sd, "elm,action,unfocus", "elm"); + _edje_signal_emit(sd, "action,unfocus", "efl"); if (sd->scroll) - edje_object_signal_emit(sd->scr_edje, "elm,action,unfocus", "elm"); + edje_object_signal_emit(sd->scr_edje, "action,unfocus", "efl"); evas_object_focus_set(sw, EINA_FALSE); if (top && top_is_win && sd->input_panel_enable) @@ -1176,11 +1176,11 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd) sd->sel_mode = EINA_FALSE; elm_widget_scroll_hold_pop(obj); edje_object_part_text_select_allow_set(sd->entry_edje, "elm.text", EINA_FALSE); - edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); + edje_object_signal_emit(sd->entry_edje, "state,select,off", "efl"); edje_object_part_text_select_none(sd->entry_edje, "elm.text"); } } - edje_object_signal_emit(sd->scr_edje, "validation,default", "elm"); + edje_object_signal_emit(sd->scr_edje, "validation,default", "efl"); } return EINA_TRUE; @@ -1230,11 +1230,11 @@ _efl_ui_text_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd * smart function */ if (sobj == elm_layout_content_get(obj, "elm.swallow.icon")) { - elm_layout_signal_emit(obj, "elm,action,hide,icon", "elm"); + elm_layout_signal_emit(obj, "action,hide,icon", "efl"); } else if (sobj == elm_layout_content_get(obj, "elm.swallow.end")) { - elm_layout_signal_emit(obj, "elm,action,hide,end", "elm"); + elm_layout_signal_emit(obj, "action,hide,end", "efl"); } ret = elm_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj); @@ -1321,7 +1321,7 @@ _hover_selected_cb(void *data, edje_object_part_text_select_allow_set (sd->entry_edje, "elm.text", EINA_TRUE); } - edje_object_signal_emit(sd->entry_edje, "elm,state,select,on", "elm"); + edje_object_signal_emit(sd->entry_edje, "state,select,on", "efl"); if (!_elm_config->desktop_entry) elm_widget_scroll_hold_push(data); @@ -1478,7 +1478,7 @@ _cut_cb(Eo *obj) if (!_elm_config->desktop_entry) edje_object_part_text_select_allow_set (sd->entry_edje, "elm.text", EINA_FALSE); - edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); + edje_object_signal_emit(sd->entry_edje, "state,select,off", "efl"); if (!_elm_config->desktop_entry) elm_widget_scroll_hold_pop(obj); @@ -1507,7 +1507,7 @@ _copy_cb(Eo *obj) { edje_object_part_text_select_allow_set (sd->entry_edje, "elm.text", EINA_FALSE); - edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); + edje_object_signal_emit(sd->entry_edje, "state,select,off", "efl"); elm_widget_scroll_hold_pop(obj); } _selection_store(ELM_SEL_TYPE_CLIPBOARD, obj); @@ -1532,7 +1532,7 @@ _hover_cancel_cb(void *data, if (!_elm_config->desktop_entry) edje_object_part_text_select_allow_set (sd->entry_edje, "elm.text", EINA_FALSE); - edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); + edje_object_signal_emit(sd->entry_edje, "state,select,off", "efl"); if (!_elm_config->desktop_entry) elm_widget_scroll_hold_pop(data); edje_object_part_text_select_none(sd->entry_edje, "elm.text"); @@ -1807,7 +1807,7 @@ static void _magnifier_hide(void *data) { EFL_UI_TEXT_DATA_GET(data, sd); - edje_object_signal_emit(sd->mgf_bg, "elm,action,hide,magnifier", "elm"); + edje_object_signal_emit(sd->mgf_bg, "action,hide,magnifier", "efl"); elm_widget_scroll_freeze_pop(data); evas_object_hide(sd->mgf_clip); } @@ -1816,7 +1816,7 @@ static void _magnifier_show(void *data) { EFL_UI_TEXT_DATA_GET(data, sd); - edje_object_signal_emit(sd->mgf_bg, "elm,action,show,magnifier", "elm"); + edje_object_signal_emit(sd->mgf_bg, "action,show,magnifier", "efl"); elm_widget_scroll_freeze_push(data); evas_object_show(sd->mgf_clip); } @@ -2181,11 +2181,11 @@ _entry_cursor_changed_signal_cb(void *data, sd->cur_changed = EINA_TRUE; if (efl_ui_focus_object_focus_get(data)) { - edje_object_signal_emit(sd->entry_edje, "elm,action,show,cursor", "elm"); + edje_object_signal_emit(sd->entry_edje, "action,show,cursor", "efl"); } else { - edje_object_signal_emit(sd->entry_edje, "elm,action,hide,cursor", "elm"); + edje_object_signal_emit(sd->entry_edje, "action,hide,cursor", "efl"); } sd->deferred_decoration_cursor = EINA_TRUE; @@ -2574,7 +2574,7 @@ _efl_ui_text_content_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char if (!int_ret) return EINA_FALSE; /* too bad entry does not follow the pattern - * "elm,state,{icon,end},visible", we have to repeat ourselves */ + * "state,{icon,end},visible", we have to repeat ourselves */ if (!part || !strcmp(part, "icon") || !strcmp(part, "elm.swallow.icon")) efl_ui_text_icon_visible_set(obj, EINA_TRUE); @@ -2593,7 +2593,7 @@ _efl_ui_text_content_unset(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const cha if (!ret) return NULL; /* too bad entry does not follow the pattern - * "elm,state,{icon,end},hidden", we have to repeat ourselves */ + * "state,{icon,end},hidden", we have to repeat ourselves */ if (!part || !strcmp(part, "icon") || !strcmp(part, "elm.swallow.icon")) efl_ui_text_icon_visible_set(obj, EINA_FALSE); @@ -3426,7 +3426,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) if (!_elm_config->desktop_entry) edje_object_part_text_select_allow_set (sd->entry_edje, "elm.text", EINA_FALSE); - edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); + edje_object_signal_emit(sd->entry_edje, "state,select,off", "efl"); } if (sd->have_selection) efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL); diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c index f042be9373..f5b15efe0e 100644 --- a/src/lib/elementary/efl_ui_video.c +++ b/src/lib/elementary/efl_ui_video.c @@ -140,13 +140,13 @@ _on_size_hints_changed(void *data EINA_UNUSED, static void _on_open_done(void *data, const Efl_Event *event EINA_UNUSED) { - elm_layout_signal_emit(data, "elm,video,open", "elm"); + elm_layout_signal_emit(data, "video,open", "efl"); } static void _on_playback_started(void *data, const Efl_Event *event EINA_UNUSED) { - elm_layout_signal_emit(data, "elm,video,play", "elm"); + elm_layout_signal_emit(data, "video,play", "efl"); return; @@ -157,7 +157,7 @@ _on_playback_finished(void *data, const Efl_Event *event EINA_UNUSED) { EFL_UI_VIDEO_DATA_GET(data, sd); emotion_object_play_set(sd->emotion, EINA_FALSE); - elm_layout_signal_emit(data, "elm,video,end", "elm"); + elm_layout_signal_emit(data, "video,end", "efl"); } static void @@ -174,8 +174,8 @@ _on_title_changed(void *data, const Efl_Event *event EINA_UNUSED) EFL_UI_VIDEO_DATA_GET(data, sd); title = emotion_object_title_get(sd->emotion); - elm_layout_text_set(data, "elm,title", title); - elm_layout_signal_emit(data, "elm,video,title", "elm"); + elm_layout_text_set(data, "title", title); + elm_layout_signal_emit(data, "video,title", "efl"); } static void @@ -276,7 +276,7 @@ _efl_ui_video_efl_file_file_set(Eo *obj, Efl_Ui_Video_Data *sd, const char *file if (filename && ((!strncmp(filename, "file://", 7)) || (!strstr(filename, "://")))) emotion_object_last_position_load(sd->emotion); - elm_layout_signal_emit(obj, "elm,video,load", "elm"); + elm_layout_signal_emit(obj, "video,load", "efl"); return EINA_TRUE; } @@ -311,7 +311,7 @@ _efl_ui_video_efl_player_play_set(Eo *obj, Efl_Ui_Video_Data *sd, Eina_Bool play ELM_SAFE_FREE(sd->timer, ecore_timer_del); sd->stop = EINA_FALSE; emotion_object_play_set(sd->emotion, EINA_TRUE); - elm_layout_signal_emit(obj, "elm,video,play", "elm"); + elm_layout_signal_emit(obj, "video,play", "efl"); } else { @@ -320,7 +320,7 @@ _efl_ui_video_efl_player_play_set(Eo *obj, Efl_Ui_Video_Data *sd, Eina_Bool play */ if (!sd->timer) sd->timer = ecore_timer_add(20.0, _suspend_cb, obj); emotion_object_play_set(sd->emotion, EINA_FALSE); - elm_layout_signal_emit(obj, "elm,video,pause", "elm"); + elm_layout_signal_emit(obj, "video,pause", "efl"); } } @@ -335,7 +335,7 @@ _efl_ui_video_efl_player_stop(Eo *obj, Efl_Ui_Video_Data *sd) sd->stop = EINA_TRUE; emotion_object_play_set(sd->emotion, EINA_FALSE); - elm_layout_signal_emit(obj, "elm,video,stop", "elm"); + elm_layout_signal_emit(obj, "video,stop", "efl"); emotion_object_suspend_set(sd->emotion, EMOTION_HIBERNATE); } diff --git a/src/lib/elementary/efl_ui_view_list.c b/src/lib/elementary/efl_ui_view_list.c index c58541009d..3de2ff051b 100644 --- a/src/lib/elementary/efl_ui_view_list.c +++ b/src/lib/elementary/efl_ui_view_list.c @@ -468,9 +468,9 @@ _efl_ui_view_list_bar_show_cb(void *data, const Efl_Event *event) Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,show,hbar", "efl"); else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,show,vbar", "efl"); } static void @@ -481,9 +481,9 @@ _efl_ui_view_list_bar_hide_cb(void *data, const Efl_Event *event) Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,hide,hbar", "efl"); else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) - edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm"); + edje_object_signal_emit(wd->resize_obj, "action,hide,vbar", "efl"); } EOLIAN static Eina_Bool @@ -512,7 +512,7 @@ static void _efl_ui_view_list_edje_object_attach(Eo *obj) { efl_layout_signal_callback_add - (obj, "reload", "elm", _efl_ui_view_list_reload_cb, obj); + (obj, "reload", "efl", _efl_ui_view_list_reload_cb, obj); //Vertical bar efl_layout_signal_callback_add (obj, "drag", "elm.dragable.vbar", _efl_ui_view_list_vbar_drag_cb, @@ -533,10 +533,10 @@ _efl_ui_view_list_edje_object_attach(Eo *obj) (obj, "drag,page", "elm.dragable.vbar", _efl_ui_view_list_edje_drag_cb, obj); efl_layout_signal_callback_add - (obj, "elm,vbar,press", "elm", + (obj, "vbar,press", "efl", _efl_ui_view_list_vbar_press_cb, obj); efl_layout_signal_callback_add - (obj, "elm,vbar,unpress", "elm", + (obj, "vbar,unpress", "efl", _efl_ui_view_list_vbar_unpress_cb, obj); //Horizontal bar @@ -559,10 +559,10 @@ _efl_ui_view_list_edje_object_attach(Eo *obj) (obj, "drag,page", "elm.dragable.hbar", _efl_ui_view_list_edje_drag_cb, obj); efl_layout_signal_callback_add - (obj, "elm,hbar,press", "elm", + (obj, "hbar,press", "efl", _efl_ui_view_list_hbar_press_cb, obj); efl_layout_signal_callback_add - (obj, "elm,hbar,unpress", "elm", + (obj, "hbar,unpress", "efl", _efl_ui_view_list_hbar_unpress_cb, obj); } @@ -570,7 +570,7 @@ static void _efl_ui_view_list_edje_object_detach(Evas_Object *obj) { efl_layout_signal_callback_del - (obj, "reload", "elm", _efl_ui_view_list_reload_cb, obj); + (obj, "reload", "efl", _efl_ui_view_list_reload_cb, obj); //Vertical bar efl_layout_signal_callback_del (obj, "drag", "elm.dragable.vbar", _efl_ui_view_list_vbar_drag_cb, @@ -591,10 +591,10 @@ _efl_ui_view_list_edje_object_detach(Evas_Object *obj) (obj, "drag,page", "elm.dragable.vbar", _efl_ui_view_list_edje_drag_cb, obj); efl_layout_signal_callback_del - (obj, "elm,vbar,press", "elm", + (obj, "vbar,press", "efl", _efl_ui_view_list_vbar_press_cb, obj); efl_layout_signal_callback_del - (obj, "elm,vbar,unpress", "elm", + (obj, "vbar,unpress", "efl", _efl_ui_view_list_vbar_unpress_cb, obj); //Horizontal bar @@ -617,10 +617,10 @@ _efl_ui_view_list_edje_object_detach(Evas_Object *obj) (obj, "drag,page", "elm.dragable.hbar", _efl_ui_view_list_edje_drag_cb, obj); efl_layout_signal_callback_del - (obj, "elm,hbar,press", "elm", + (obj, "hbar,press", "efl", _efl_ui_view_list_hbar_press_cb, obj); efl_layout_signal_callback_del - (obj, "elm,hbar,unpress", "elm", + (obj, "hbar,unpress", "efl", _efl_ui_view_list_hbar_unpress_cb, obj); } diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 00ab716b90..3e17d07d19 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -3097,8 +3097,8 @@ elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wnam if (sd->orient_mode != -1) { char buf[128]; - snprintf(buf, sizeof(buf), "elm,state,orient,%d", sd->orient_mode); - elm_widget_signal_emit(obj, buf, "elm"); + snprintf(buf, sizeof(buf), "state,orient,%d", sd->orient_mode); + elm_widget_signal_emit(obj, buf, "efl"); } return ret; @@ -3582,8 +3582,8 @@ _efl_ui_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int ori if (orient_mode != -1) { char buf[128]; - snprintf(buf, sizeof(buf), "elm,state,orient,%d", orient_mode); - elm_widget_signal_emit(obj, buf, "elm"); + snprintf(buf, sizeof(buf), "state,orient,%d", orient_mode); + elm_widget_signal_emit(obj, buf, "efl"); } } diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 118d075dcf..f5c32d3834 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -1029,11 +1029,11 @@ _elm_win_focus_highlight_visible_set(Efl_Ui_Win_Data *sd, if (visible) { evas_object_show(fobj); - edje_object_signal_emit(fobj, "elm,action,focus,show", "elm"); + edje_object_signal_emit(fobj, "action,focus,show", "efl"); } else { - edje_object_signal_emit(fobj, "elm,action,focus,hide", "elm"); + edje_object_signal_emit(fobj, "action,focus,hide", "efl"); } } @@ -1089,7 +1089,7 @@ _elm_win_focus_highlight_simple_setup(Efl_Ui_Win_Data *sd, if (clip) evas_object_clip_set(obj, clip); } - edje_object_signal_emit(obj, "elm,state,anim,stop", "elm"); + edje_object_signal_emit(obj, "state,anim,stop", "efl"); } static void @@ -1131,7 +1131,7 @@ _elm_win_focus_highlight_reconfigure_job(void *data) (previous, EVAS_CALLBACK_DEL, _elm_win_focus_prev_target_del, data); if (sd->focus_highlight.prev.in_theme) elm_widget_signal_emit - (previous, "elm,action,focus_highlight,hide", "elm"); + (previous, "action,focus_highlight,hide", "efl"); } if (!target) @@ -1140,15 +1140,15 @@ _elm_win_focus_highlight_reconfigure_job(void *data) { common_visible = EINA_FALSE; if (sd->focus_highlight.cur.visible) - sig = "elm,action,focus_highlight,show"; + sig = "action,focus_highlight,show"; else - sig = "elm,action,focus_highlight,hide"; + sig = "action,focus_highlight,hide"; } else common_visible = sd->focus_highlight.cur.visible; if (sig) - elm_widget_signal_emit(target, sig, "elm"); + elm_widget_signal_emit(target, sig, "efl"); if ((!target) || (!common_visible) || (sd->focus_highlight.cur.in_theme)) { @@ -2246,7 +2246,7 @@ _elm_win_modality_increment(Efl_Ui_Win_Data *modalsd) if (cursd->modal_count > 0) { Edje_Object *ed = _elm_win_modal_blocker_edje_get(cursd); - edje_object_signal_emit(ed, "elm,action,show_blocker", "elm"); + edje_object_signal_emit(ed, "action,show_blocker", "efl"); efl_event_callback_legacy_call (cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); _elm_win_frame_style_update(cursd, 0, 1); @@ -2268,7 +2268,7 @@ _elm_win_modality_decrement(Efl_Ui_Win_Data *modalsd) if (cursd->modal_count == 0) { Edje_Object *ed = _elm_win_modal_blocker_edje_get(cursd); - edje_object_signal_emit(ed, "elm,action,hide_blocker", "elm"); + edje_object_signal_emit(ed, "action,hide_blocker", "efl"); efl_event_callback_legacy_call (cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); _elm_win_frame_style_update(cursd, 0, 1); @@ -2700,7 +2700,7 @@ _elm_win_focus_highlight_shutdown(Efl_Ui_Win_Data *sd) if (sd->focus_highlight.cur.target) { elm_widget_signal_emit(sd->focus_highlight.cur.target, - "elm,action,focus_highlight,hide", "elm"); + "action,focus_highlight,hide", "efl"); _elm_win_focus_target_callbacks_del(sd); evas_object_event_callback_del_full (sd->focus_highlight.cur.target, @@ -3860,10 +3860,10 @@ _elm_win_focus_highlight_init(Efl_Ui_Win_Data *sd) { sd->focus_highlight.fobj = edje_object_add(sd->evas); edje_object_signal_callback_add(sd->focus_highlight.fobj, - "elm,action,focus,hide,end", "*", + "action,focus,hide,end", "*", _elm_win_focus_highlight_hide, NULL); edje_object_signal_callback_add(sd->focus_highlight.fobj, - "elm,action,focus,anim,end", "*", + "action,focus,anim,end", "*", _elm_win_focus_highlight_anim_end, sd->obj); } @@ -4398,30 +4398,30 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style) evas_object_smart_calculate(sd->frame_obj); edje_object_signal_callback_add - (sd->frame_obj, "elm,action,move,start", "elm", + (sd->frame_obj, "action,move,start", "efl", _elm_win_frame_cb_move_start, obj); edje_object_signal_callback_add - (sd->frame_obj, "elm,action,move,stop", "elm", + (sd->frame_obj, "action,move,stop", "efl", _elm_win_frame_cb_move_stop, obj); edje_object_signal_callback_add - (sd->frame_obj, "elm,action,resize,show", "*", + (sd->frame_obj, "action,resize,show", "*", _elm_win_frame_cb_resize_show, obj); edje_object_signal_callback_add - (sd->frame_obj, "elm,action,resize,hide", "*", + (sd->frame_obj, "action,resize,hide", "*", _elm_win_frame_cb_resize_hide, obj); edje_object_signal_callback_add - (sd->frame_obj, "elm,action,resize,start", "*", + (sd->frame_obj, "action,resize,start", "*", _elm_win_frame_cb_resize_start, obj); edje_object_signal_callback_add - (sd->frame_obj, "elm,action,minimize", "elm", + (sd->frame_obj, "action,minimize", "efl", _elm_win_frame_cb_minimize, obj); edje_object_signal_callback_add - (sd->frame_obj, "elm,action,maximize", "elm", + (sd->frame_obj, "action,maximize", "efl", _elm_win_frame_cb_maximize, obj); edje_object_signal_callback_add - (sd->frame_obj, "elm,action,close", "elm", _elm_win_frame_cb_close, obj); + (sd->frame_obj, "action,close", "efl", _elm_win_frame_cb_close, obj); edje_object_signal_callback_add - (sd->frame_obj, "elm,action,menu", "elm", _elm_win_frame_cb_menu, obj); + (sd->frame_obj, "action,menu", "efl", _elm_win_frame_cb_menu, obj); if (!sd->pointer.obj) { @@ -4517,21 +4517,21 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool if (force_emit || (state != sd->csd.cur_##state)) \ { \ const char *sig = state ? s1 : s2; \ - edje_object_signal_emit(sd->frame_obj, sig, "elm"); \ + edje_object_signal_emit(sd->frame_obj, sig, "efl"); \ DBG("frame style emit: %p %s", sd->obj, sig); \ sd->csd.cur_##state = state; \ changed = EINA_TRUE; \ } } while (0) - STATE_SET(borderless, "elm,state,borderless,on", "elm,state,borderless,off"); - STATE_SET(shadow, "elm,state,shadow,on", "elm,state,shadow,off"); - STATE_SET(maximized, "elm,state,maximized", "elm,state,unmaximized"); - STATE_SET(focus, "elm,action,focus", "elm,action,unfocus"); - STATE_SET(bg_solid, "elm,state,background,solid,on", "elm,state,background,solid,off"); - STATE_SET(bg_standard, "elm,state,background,standard,on", "elm,state,background,standard,off"); - STATE_SET(unresizable, "elm,state,unresizable,on", "elm,state,unresizable,off"); - STATE_SET(menu, "elm,action,show_menu", "elm,action,hide_menu"); - STATE_SET(indicator, "elm,action,show_indicator", "elm,action,hide_indicator"); + STATE_SET(borderless, "state,borderless,on", "state,borderless,off"); + STATE_SET(shadow, "state,shadow,on", "state,shadow,off"); + STATE_SET(maximized, "state,maximized", "state,unmaximized"); + STATE_SET(focus, "action,focus", "action,unfocus"); + STATE_SET(bg_solid, "state,background,solid,on", "state,background,solid,off"); + STATE_SET(bg_standard, "state,background,standard,on", "state,background,standard,off"); + STATE_SET(unresizable, "state,unresizable,on", "state,unresizable,off"); + STATE_SET(menu, "action,show_menu", "action,hide_menu"); + STATE_SET(indicator, "action,show_indicator", "action,hide_indicator"); #undef STATE_SET @@ -5964,9 +5964,9 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data) _elm_win_resize_objects_eval(sd->obj, EINA_FALSE); if (swallow != sd->frame_obj) { - // Note: Based on EFL 1.18 the signal was "elm,action,hide" - // and not "elm,action,hide_menu" as expected. - edje_object_signal_emit(swallow, "elm,action,hide", "elm"); + // Note: Based on EFL 1.18 the signal was "action,hide" + // and not "action,hide_menu" as expected. + edje_object_signal_emit(swallow, "action,hide", "efl"); edje_object_message_signal_recursive_process(swallow); } } @@ -5983,7 +5983,7 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data) } else { - edje_object_signal_emit(swallow, "elm,action,show_menu", "elm"); + edje_object_signal_emit(swallow, "action,show_menu", "efl"); edje_object_message_signal_recursive_process(swallow); } } @@ -6495,11 +6495,11 @@ _efl_ui_win_indicator_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Efl_Ui_ if (!sd->indicator) _indicator_add(sd); if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_OPAQUE) - edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_opaque", "elm"); + edje_object_signal_emit(sd->frame_obj, "action,indicator,bg_opaque", "efl"); else if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_TRANSPARENT) - edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_transparent", "elm"); + edje_object_signal_emit(sd->frame_obj, "action,indicator,bg_transparent", "efl"); else if (sd->indimode == EFL_UI_WIN_INDICATOR_HIDDEN) - edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,hidden", "elm"); + edje_object_signal_emit(sd->frame_obj, "action,indicator,hidden", "efl"); edje_object_message_signal_process(sd->frame_obj); evas_object_smart_calculate(sd->frame_obj);