davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=88c53dd2bc8280eb99feebad7a68b860e85113bd
commit 88c53dd2bc8280eb99feebad7a68b860e85113bd Author: davemds <[email protected]> Date: Sun Feb 16 15:43:42 2014 +0100 Emotion test: rename speed slider to alpha as it should be. That slider was probaly used for speed years ago, it is used for alpha now, so call it with the right name. --- src/tests/emotion/data/theme.edc | 37 +++++++++++++++++------------------ src/tests/emotion/emotion_test_main.c | 18 ++++++++--------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/tests/emotion/data/theme.edc b/src/tests/emotion/data/theme.edc index 2a50c09..c4ba3ac 100644 --- a/src/tests/emotion/data/theme.edc +++ b/src/tests/emotion/data/theme.edc @@ -646,13 +646,13 @@ collections { // "video_swallow" // // need txt parts: - // "video_speed_txt" + // "video_alpha_txt" // "video_volume_txt" // "video_progress_txt" // // need dragables: // "video_progress" horizontal - // "video_speed" vertical + // "video_alpha" vertical // "video_volume" vertical part { name: "video_swallow"; mouse_events: 0; type: SWALLOW; description { state: "default" 0.0; @@ -734,7 +734,7 @@ collections { } } } - part { name: "video_speed_txt"; type: TEXT; mouse_events: 0; + part { name: "video_alpha_txt"; type: TEXT; mouse_events: 0; description { state: "default" 0.0; rel1 { to: "video_frame_top"; @@ -825,7 +825,7 @@ collections { } } } - part { name: "video_speed_confine"; mouse_events: 0; type: RECT; + part { name: "video_alpha_confine"; mouse_events: 0; type: RECT; description { state: "default" 0.0; rel1 { to: "video_frame_right"; @@ -840,22 +840,22 @@ collections { color: 0 0 0 0; } } - part { name: "video_speed"; mouse_events: 1; + part { name: "video_alpha"; mouse_events: 1; dragable { x: 0 0 0; y: -1 1 0; - confine: "video_speed_confine"; + confine: "video_alpha_confine"; } description { state: "default" 0.0; fixed: 1 1; min: 24 24; rel1 { - to: "video_speed_confine"; + to: "video_alpha_confine"; relative: 0.5 0.5; offset: 0 0; } rel2 { - to: "video_speed_confine"; + to: "video_alpha_confine"; relative: 0.5 0.5; offset: 0 0; } @@ -1018,7 +1018,7 @@ collections { // "video_control" "pause" // "video_control" "stop" // "drag" "video_progress" - // "drag" "video_speed" + // "drag" "video_alpha" // "drag" "video_volume" // // get signals: @@ -1069,12 +1069,12 @@ collections { // "video_swallow" // // need txt parts: - // "video_speed_txt" + // "video_alpha_txt" // "video_progress_txt" // // need dragables: // "video_progress" horizontal - // "video_speed" vertical + // "video_alpha" vertical part { name: "video_swallow"; mouse_events: 0; type: SWALLOW; description { state: "default" 0.0; rel1 { @@ -1195,7 +1195,7 @@ collections { } } } - part { name: "video_speed_txt"; type: TEXT; mouse_events: 0; + part { name: "video_alpha_txt"; type: TEXT; mouse_events: 0; description { state: "default" 0.0; rel1 { to: "video_frame_bottom"; @@ -1209,7 +1209,6 @@ collections { } color: 0 0 0 255; text { - text: "Video Speed"; font: "Sans"; size: 6; align: 1.0 0.5; @@ -1275,7 +1274,7 @@ collections { } } } - part { name: "video_speed_confine"; mouse_events: 0; type: RECT; + part { name: "video_alpha_confine"; mouse_events: 0; type: RECT; description { state: "default" 0.0; rel1 { to: "video_frame_right"; @@ -1290,22 +1289,22 @@ collections { color: 0 0 0 0; } } - part { name: "video_speed"; mouse_events: 1; + part { name: "video_alpha"; mouse_events: 1; dragable { x: 0 0 0; y: -1 1 0; - confine: "video_speed_confine"; + confine: "video_alpha_confine"; } description { state: "default" 0.0; fixed: 1 1; min: 24 24; rel1 { - to: "video_speed_confine"; + to: "video_alpha_confine"; relative: 0.5 0.5; offset: 0 0; } rel2 { - to: "video_speed_confine"; + to: "video_alpha_confine"; relative: 0.5 0.5; offset: 0 0; } @@ -1431,7 +1430,7 @@ collections { // "video_control" "pause" // "video_control" "stop" // "drag" "video_progress" - // "drag" "video_speed" + // "drag" "video_alpha" // // get signals: // "video_state" "play" diff --git a/src/tests/emotion/emotion_test_main.c b/src/tests/emotion/emotion_test_main.c index c2274a4..5b105fe 100644 --- a/src/tests/emotion/emotion_test_main.c +++ b/src/tests/emotion/emotion_test_main.c @@ -501,18 +501,18 @@ video_obj_signal_jump_cb(void *data, Evas_Object *o, const char *emission EINA_U } static void -video_obj_signal_speed_cb(void *data, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) +video_obj_signal_alpha_cb(void *data, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Evas_Object *ov = data; - double spd; + double alpha; double x, y; char buf[256]; edje_object_part_drag_value_get(o, source, &x, &y); - spd = 255 * y; - evas_object_color_set(ov, spd, spd, spd, spd); - snprintf(buf, sizeof(buf), "alpha %.0f", spd); - edje_object_part_text_set(o, "video_speed_txt", buf); + alpha = 255 * y; + evas_object_color_set(ov, alpha, alpha, alpha, alpha); + snprintf(buf, sizeof(buf), "alpha %.0f", alpha); + edje_object_part_text_set(o, "video_alpha_txt", buf); } static void @@ -670,7 +670,7 @@ init_video_object(const char *module_filename, const char *filename) edje_object_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o); edje_object_signal_callback_add(oe, "video_control", "stop", video_obj_signal_stop_cb, o); edje_object_signal_callback_add(oe, "drag", "video_progress", video_obj_signal_jump_cb, o); - edje_object_signal_callback_add(oe, "drag", "video_speed", video_obj_signal_speed_cb, o); + edje_object_signal_callback_add(oe, "drag", "video_alpha", video_obj_signal_alpha_cb, o); edje_object_signal_callback_add(oe, "drag", "video_volume", video_obj_signal_vol_cb, o); edje_object_signal_callback_add(oe, "frame_move", "start", video_obj_signal_frame_move_start_cb, oe); @@ -679,8 +679,8 @@ init_video_object(const char *module_filename, const char *filename) edje_object_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe); edje_object_signal_callback_add(oe, "mouse,move", "*", video_obj_signal_frame_move_cb, oe); - edje_object_part_drag_value_set(oe, "video_speed", 0.0, 1.0); - edje_object_part_text_set(oe, "video_speed_txt", "alpha 255"); + edje_object_part_drag_value_set(oe, "video_alpha", 0.0, 1.0); + edje_object_part_text_set(oe, "video_alpha_txt", "alpha 255"); edje_object_part_drag_value_set(oe, "video_volume", 0.0, 0.5); edje_object_part_text_set(oe, "video_volume_txt", "vol 0.50"); --
