From 5ec2d99fb6aa33a966f892847697e2fa7831fdbe Mon Sep 17 00:00:00 2001 From: rephorm Date: Wed, 23 Aug 2006 01:13:04 +0000 Subject: [PATCH] some more theme work SVN revision: 25051 --- data/themes/default_gadman.edc | 62 +++++++++++++++++----------------- data/themes/default_slider.edc | 8 ++--- src/bin/e_gadcon.c | 40 +++++++++++----------- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/data/themes/default_gadman.edc b/data/themes/default_gadman.edc index ad600520e..43f02ba64 100644 --- a/data/themes/default_gadman.edc +++ b/data/themes/default_gadman.edc @@ -847,75 +847,75 @@ group { programs { program { name: "api_hsize_on"; - signal: "hsize"; - source: "on"; + signal: "e,state,hsize,on"; + source: "e"; action: STATE_SET "default" 0.0; target: "hclip"; } program { name: "api_hsize_off"; - signal: "hsize"; - source: "off"; + signal: "e,state,hsize,off"; + source: "e"; action: STATE_SET "disabled" 0.0; target: "hclip"; } program { name: "api_vsize_on"; - signal: "vsize"; - source: "on"; + signal: "e,state,vsize,on"; + source: "e"; action: STATE_SET "default" 0.0; target: "vclip"; } program { name: "api_vsize_off"; - signal: "vsize"; - source: "off"; + signal: "e,state,vsize,off"; + source: "e"; action: STATE_SET "disabled" 0.0; target: "vclip"; } program { name: "api_move_on"; - signal: "move"; - source: "on"; + signal: "e,state,move,on"; + source: "e"; action: STATE_SET "default" 0.0; target: "indicator"; } program { name: "api_move_off"; - signal: "move"; - source: "off"; + signal: "e,state,move,off"; + source: "e"; action: STATE_SET "disabled" 0.0; target: "indicator"; } /* program { name: "api_active"; - signal: "active"; - source: ""; + signal: "e,state,focused"; + source: "e"; } program { name: "api_inactive"; - signal: "inactive"; - source: ""; + signal: "e,state,unfocused"; + source: "e"; } */ program { name: "mv_down"; signal: "mouse,down,1"; source: "overlay"; - action: SIGNAL_EMIT "move_start" ""; + action: SIGNAL_EMIT "e,action,move,start" ""; } program { name: "mv_up"; signal: "mouse,up,1"; source: "overlay"; - action: SIGNAL_EMIT "move_stop" ""; + action: SIGNAL_EMIT "e,action,move,stop" ""; } program { name: "mv_move"; signal: "mouse,move"; source: "overlay"; - action: SIGNAL_EMIT "move_go" ""; + action: SIGNAL_EMIT "e,action,move,go" ""; } program { @@ -938,19 +938,19 @@ group { name: "h1_down2"; signal: "mouse,down,1"; source: "h1"; - action: SIGNAL_EMIT "resize_start" "left"; + action: SIGNAL_EMIT "e,action,resize,left,start" ""; } program { name: "h1_up2"; signal: "mouse,up,1"; source: "h1"; - action: SIGNAL_EMIT "resize_stop" "left"; + action: SIGNAL_EMIT "e,action,resize,left,stop" ""; } program { name: "h1_move"; signal: "mouse,move"; source: "h1"; - action: SIGNAL_EMIT "resize_go" "left"; + action: SIGNAL_EMIT "e,action,resize,left,go" ""; } program { name: "h1_in"; @@ -1051,19 +1051,19 @@ group { name: "h2_down2"; signal: "mouse,down,1"; source: "h2"; - action: SIGNAL_EMIT "resize_start" "right"; + action: SIGNAL_EMIT "e,action,resize,right,start" ""; } program { name: "h2_up2"; signal: "mouse,up,1"; source: "h2"; - action: SIGNAL_EMIT "resize_stop" "right"; + action: SIGNAL_EMIT "e,action,resize,right,stop" ""; } program { name: "h2_move"; signal: "mouse,move"; source: "h2"; - action: SIGNAL_EMIT "resize_go" "right"; + action: SIGNAL_EMIT "e,action,resize,right,go" ""; } program { name: "h2_in"; @@ -1165,19 +1165,19 @@ group { name: "v1_down2"; signal: "mouse,down,1"; source: "v1"; - action: SIGNAL_EMIT "resize_start" "up"; + action: SIGNAL_EMIT "e,action,resize,up,start" ""; } program { name: "v1_up2"; signal: "mouse,up,1"; source: "v1"; - action: SIGNAL_EMIT "resize_stop" "up"; + action: SIGNAL_EMIT "e,action,resize,up,stop" ""; } program { name: "v1_move"; signal: "mouse,move"; source: "v1"; - action: SIGNAL_EMIT "resize_go" "up"; + action: SIGNAL_EMIT "e,action,resize,up,go" ""; } program { name: "v1_in"; @@ -1279,19 +1279,19 @@ group { name: "v2_down2"; signal: "mouse,down,1"; source: "v2"; - action: SIGNAL_EMIT "resize_start" "down"; + action: SIGNAL_EMIT "e,action,resize,down,start" ""; } program { name: "v2_up2"; signal: "mouse,up,1"; source: "v2"; - action: SIGNAL_EMIT "resize_stop" "down"; + action: SIGNAL_EMIT "e,action,resize,down,stop" ""; } program { name: "v2_move"; signal: "mouse,move"; source: "v2"; - action: SIGNAL_EMIT "resize_go" "down"; + action: SIGNAL_EMIT "e,action,resize,down,go" ""; } program { name: "v2_in"; diff --git a/data/themes/default_slider.edc b/data/themes/default_slider.edc index f290f0d00..e2a8b5d65 100644 --- a/data/themes/default_slider.edc +++ b/data/themes/default_slider.edc @@ -381,7 +381,7 @@ group { target: "focus"; } program { - name: "e,action,show,label"; + name: "show_label"; signal: "e,action,show,label"; source: "e"; action: STATE_SET "active" 0.0; @@ -391,7 +391,7 @@ group { target: "label_over"; } program { - name: "e,action,hide,label"; + name: "hide_label"; signal: "e,action,hide,label"; source: "e"; action: STATE_SET "default" 0.0; @@ -792,7 +792,7 @@ group { target: "focus"; } program { - name: "e,action,show,label"; + name: "show_label"; signal: "e,action,show,label"; source: "e"; action: STATE_SET "active" 0.0; @@ -802,7 +802,7 @@ group { target: "label_over"; } program { - name: "e,action,hide,label"; + name: "hide_label"; signal: "e,action,hide,label"; source: "e"; action: STATE_SET "default" 0.0; diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 222da1696..59194c5d9 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -619,16 +619,16 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc) if ((gcc->autoscroll) || (gcc->resizable)) { if (e_box_orientation_get(gcc->o_box)) - edje_object_signal_emit(gcc->o_control, "hsize", "on"); + edje_object_signal_emit(gcc->o_control, "e,state,hsize,on", "e"); else - edje_object_signal_emit(gcc->o_control, "vsize", "on"); + edje_object_signal_emit(gcc->o_control, "e,state,vsize,on", "e"); } else { - edje_object_signal_emit(gcc->o_control, "hsize", "off"); - edje_object_signal_emit(gcc->o_control, "vsize", "off"); + edje_object_signal_emit(gcc->o_control, "e,state,hsize,off", "e"); + edje_object_signal_emit(gcc->o_control, "e,state,vsize,off", "e"); } - edje_object_signal_emit(gcc->o_control, "move", "on"); + edje_object_signal_emit(gcc->o_control, "e,state,move,on", "e"); gcc->o_event = evas_object_rectangle_add(gcc->gadcon->evas); evas_object_color_set(gcc->o_event, 0, 0, 0, 0); @@ -637,35 +637,35 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc) evas_object_move(gcc->o_event, x, y); evas_object_resize(gcc->o_event, w, h); - edje_object_signal_callback_add(gcc->o_control, "move_start", "", + edje_object_signal_callback_add(gcc->o_control, "e,action,move,start", "", _e_gadcon_cb_signal_move_start, gcc); - edje_object_signal_callback_add(gcc->o_control, "move_stop", "", + edje_object_signal_callback_add(gcc->o_control, "e,action,move,stop", "", _e_gadcon_cb_signal_move_stop, gcc); - edje_object_signal_callback_add(gcc->o_control, "move_go", "", + edje_object_signal_callback_add(gcc->o_control, "e,action,move,go", "", _e_gadcon_cb_signal_move_go, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_start", "left", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,left,start", "", _e_gadcon_cb_signal_resize_left_start, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_stop", "left", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,left,stop", "", _e_gadcon_cb_signal_resize_left_stop, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_go", "left", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,left,go", "", _e_gadcon_cb_signal_resize_left_go, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_start", "right", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,right,start", "", _e_gadcon_cb_signal_resize_right_start, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_stop", "right", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,right,stop", "", _e_gadcon_cb_signal_resize_right_stop, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_go", "right", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,right,go", "", _e_gadcon_cb_signal_resize_right_go, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_start", "up", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,up,start", "", _e_gadcon_cb_signal_resize_left_start, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_stop", "up", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,up,stop", "", _e_gadcon_cb_signal_resize_left_stop, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_go", "up", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,up,go", "", _e_gadcon_cb_signal_resize_left_go, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_start", "down", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,down,start", "", _e_gadcon_cb_signal_resize_right_start, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_stop", "down", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,down,stop", "", _e_gadcon_cb_signal_resize_right_stop, gcc); - edje_object_signal_callback_add(gcc->o_control, "resize_go", "down", + edje_object_signal_callback_add(gcc->o_control, "e,action,resize,down,go", "", _e_gadcon_cb_signal_resize_right_go, gcc); evas_object_event_callback_add(gcc->o_event, EVAS_CALLBACK_MOUSE_DOWN, _e_gadcon_cb_mouse_down, gcc);