summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavemds <dave@gurumeditation.it>2014-02-16 15:43:42 +0100
committerdavemds <dave@gurumeditation.it>2014-02-16 18:27:10 +0100
commit88c53dd2bc8280eb99feebad7a68b860e85113bd (patch)
tree08a306fe640c665a80e4441b46ef810e959cf610
parent2ed26fed596456f144700d8a45b89484bda1d16c (diff)
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.
-rw-r--r--src/tests/emotion/data/theme.edc37
-rw-r--r--src/tests/emotion/emotion_test_main.c18
2 files changed, 27 insertions, 28 deletions
diff --git a/src/tests/emotion/data/theme.edc b/src/tests/emotion/data/theme.edc
index 2a50c09a82..c4ba3acf81 100644
--- a/src/tests/emotion/data/theme.edc
+++ b/src/tests/emotion/data/theme.edc
@@ -646,13 +646,13 @@ collections {
646 // "video_swallow" 646 // "video_swallow"
647 // 647 //
648 // need txt parts: 648 // need txt parts:
649 // "video_speed_txt" 649 // "video_alpha_txt"
650 // "video_volume_txt" 650 // "video_volume_txt"
651 // "video_progress_txt" 651 // "video_progress_txt"
652 // 652 //
653 // need dragables: 653 // need dragables:
654 // "video_progress" horizontal 654 // "video_progress" horizontal
655 // "video_speed" vertical 655 // "video_alpha" vertical
656 // "video_volume" vertical 656 // "video_volume" vertical
657 part { name: "video_swallow"; mouse_events: 0; type: SWALLOW; 657 part { name: "video_swallow"; mouse_events: 0; type: SWALLOW;
658 description { state: "default" 0.0; 658 description { state: "default" 0.0;
@@ -734,7 +734,7 @@ collections {
734 } 734 }
735 } 735 }
736 } 736 }
737 part { name: "video_speed_txt"; type: TEXT; mouse_events: 0; 737 part { name: "video_alpha_txt"; type: TEXT; mouse_events: 0;
738 description { state: "default" 0.0; 738 description { state: "default" 0.0;
739 rel1 { 739 rel1 {
740 to: "video_frame_top"; 740 to: "video_frame_top";
@@ -825,7 +825,7 @@ collections {
825 } 825 }
826 } 826 }
827 } 827 }
828 part { name: "video_speed_confine"; mouse_events: 0; type: RECT; 828 part { name: "video_alpha_confine"; mouse_events: 0; type: RECT;
829 description { state: "default" 0.0; 829 description { state: "default" 0.0;
830 rel1 { 830 rel1 {
831 to: "video_frame_right"; 831 to: "video_frame_right";
@@ -840,22 +840,22 @@ collections {
840 color: 0 0 0 0; 840 color: 0 0 0 0;
841 } 841 }
842 } 842 }
843 part { name: "video_speed"; mouse_events: 1; 843 part { name: "video_alpha"; mouse_events: 1;
844 dragable { 844 dragable {
845 x: 0 0 0; 845 x: 0 0 0;
846 y: -1 1 0; 846 y: -1 1 0;
847 confine: "video_speed_confine"; 847 confine: "video_alpha_confine";
848 } 848 }
849 description { state: "default" 0.0; 849 description { state: "default" 0.0;
850 fixed: 1 1; 850 fixed: 1 1;
851 min: 24 24; 851 min: 24 24;
852 rel1 { 852 rel1 {
853 to: "video_speed_confine"; 853 to: "video_alpha_confine";
854 relative: 0.5 0.5; 854 relative: 0.5 0.5;
855 offset: 0 0; 855 offset: 0 0;
856 } 856 }
857 rel2 { 857 rel2 {
858 to: "video_speed_confine"; 858 to: "video_alpha_confine";
859 relative: 0.5 0.5; 859 relative: 0.5 0.5;
860 offset: 0 0; 860 offset: 0 0;
861 } 861 }
@@ -1018,7 +1018,7 @@ collections {
1018 // "video_control" "pause" 1018 // "video_control" "pause"
1019 // "video_control" "stop" 1019 // "video_control" "stop"
1020 // "drag" "video_progress" 1020 // "drag" "video_progress"
1021 // "drag" "video_speed" 1021 // "drag" "video_alpha"
1022 // "drag" "video_volume" 1022 // "drag" "video_volume"
1023 // 1023 //
1024 // get signals: 1024 // get signals:
@@ -1069,12 +1069,12 @@ collections {
1069 // "video_swallow" 1069 // "video_swallow"
1070 // 1070 //
1071 // need txt parts: 1071 // need txt parts:
1072 // "video_speed_txt" 1072 // "video_alpha_txt"
1073 // "video_progress_txt" 1073 // "video_progress_txt"
1074 // 1074 //
1075 // need dragables: 1075 // need dragables:
1076 // "video_progress" horizontal 1076 // "video_progress" horizontal
1077 // "video_speed" vertical 1077 // "video_alpha" vertical
1078 part { name: "video_swallow"; mouse_events: 0; type: SWALLOW; 1078 part { name: "video_swallow"; mouse_events: 0; type: SWALLOW;
1079 description { state: "default" 0.0; 1079 description { state: "default" 0.0;
1080 rel1 { 1080 rel1 {
@@ -1195,7 +1195,7 @@ collections {
1195 } 1195 }
1196 } 1196 }
1197 } 1197 }
1198 part { name: "video_speed_txt"; type: TEXT; mouse_events: 0; 1198 part { name: "video_alpha_txt"; type: TEXT; mouse_events: 0;
1199 description { state: "default" 0.0; 1199 description { state: "default" 0.0;
1200 rel1 { 1200 rel1 {
1201 to: "video_frame_bottom"; 1201 to: "video_frame_bottom";
@@ -1209,7 +1209,6 @@ collections {
1209 } 1209 }
1210 color: 0 0 0 255; 1210 color: 0 0 0 255;
1211 text { 1211 text {
1212 text: "Video Speed";
1213 font: "Sans"; 1212 font: "Sans";
1214 size: 6; 1213 size: 6;
1215 align: 1.0 0.5; 1214 align: 1.0 0.5;
@@ -1275,7 +1274,7 @@ collections {
1275 } 1274 }
1276 } 1275 }
1277 } 1276 }
1278 part { name: "video_speed_confine"; mouse_events: 0; type: RECT; 1277 part { name: "video_alpha_confine"; mouse_events: 0; type: RECT;
1279 description { state: "default" 0.0; 1278 description { state: "default" 0.0;
1280 rel1 { 1279 rel1 {
1281 to: "video_frame_right"; 1280 to: "video_frame_right";
@@ -1290,22 +1289,22 @@ collections {
1290 color: 0 0 0 0; 1289 color: 0 0 0 0;
1291 } 1290 }
1292 } 1291 }
1293 part { name: "video_speed"; mouse_events: 1; 1292 part { name: "video_alpha"; mouse_events: 1;
1294 dragable { 1293 dragable {
1295 x: 0 0 0; 1294 x: 0 0 0;
1296 y: -1 1 0; 1295 y: -1 1 0;
1297 confine: "video_speed_confine"; 1296 confine: "video_alpha_confine";
1298 } 1297 }
1299 description { state: "default" 0.0; 1298 description { state: "default" 0.0;
1300 fixed: 1 1; 1299 fixed: 1 1;
1301 min: 24 24; 1300 min: 24 24;
1302 rel1 { 1301 rel1 {
1303 to: "video_speed_confine"; 1302 to: "video_alpha_confine";
1304 relative: 0.5 0.5; 1303 relative: 0.5 0.5;
1305 offset: 0 0; 1304 offset: 0 0;
1306 } 1305 }
1307 rel2 { 1306 rel2 {
1308 to: "video_speed_confine"; 1307 to: "video_alpha_confine";
1309 relative: 0.5 0.5; 1308 relative: 0.5 0.5;
1310 offset: 0 0; 1309 offset: 0 0;
1311 } 1310 }
@@ -1431,7 +1430,7 @@ collections {
1431 // "video_control" "pause" 1430 // "video_control" "pause"
1432 // "video_control" "stop" 1431 // "video_control" "stop"
1433 // "drag" "video_progress" 1432 // "drag" "video_progress"
1434 // "drag" "video_speed" 1433 // "drag" "video_alpha"
1435 // 1434 //
1436 // get signals: 1435 // get signals:
1437 // "video_state" "play" 1436 // "video_state" "play"
diff --git a/src/tests/emotion/emotion_test_main.c b/src/tests/emotion/emotion_test_main.c
index c2274a4471..5b105fe912 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
501} 501}
502 502
503static void 503static void
504video_obj_signal_speed_cb(void *data, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) 504video_obj_signal_alpha_cb(void *data, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
505{ 505{
506 Evas_Object *ov = data; 506 Evas_Object *ov = data;
507 double spd; 507 double alpha;
508 double x, y; 508 double x, y;
509 char buf[256]; 509 char buf[256];
510 510
511 edje_object_part_drag_value_get(o, source, &x, &y); 511 edje_object_part_drag_value_get(o, source, &x, &y);
512 spd = 255 * y; 512 alpha = 255 * y;
513 evas_object_color_set(ov, spd, spd, spd, spd); 513 evas_object_color_set(ov, alpha, alpha, alpha, alpha);
514 snprintf(buf, sizeof(buf), "alpha %.0f", spd); 514 snprintf(buf, sizeof(buf), "alpha %.0f", alpha);
515 edje_object_part_text_set(o, "video_speed_txt", buf); 515 edje_object_part_text_set(o, "video_alpha_txt", buf);
516} 516}
517 517
518static void 518static void
@@ -670,7 +670,7 @@ init_video_object(const char *module_filename, const char *filename)
670 edje_object_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o); 670 edje_object_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o);
671 edje_object_signal_callback_add(oe, "video_control", "stop", video_obj_signal_stop_cb, o); 671 edje_object_signal_callback_add(oe, "video_control", "stop", video_obj_signal_stop_cb, o);
672 edje_object_signal_callback_add(oe, "drag", "video_progress", video_obj_signal_jump_cb, o); 672 edje_object_signal_callback_add(oe, "drag", "video_progress", video_obj_signal_jump_cb, o);
673 edje_object_signal_callback_add(oe, "drag", "video_speed", video_obj_signal_speed_cb, o); 673 edje_object_signal_callback_add(oe, "drag", "video_alpha", video_obj_signal_alpha_cb, o);
674 edje_object_signal_callback_add(oe, "drag", "video_volume", video_obj_signal_vol_cb, o); 674 edje_object_signal_callback_add(oe, "drag", "video_volume", video_obj_signal_vol_cb, o);
675 675
676 edje_object_signal_callback_add(oe, "frame_move", "start", video_obj_signal_frame_move_start_cb, oe); 676 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)
679 edje_object_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe); 679 edje_object_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe);
680 edje_object_signal_callback_add(oe, "mouse,move", "*", video_obj_signal_frame_move_cb, oe); 680 edje_object_signal_callback_add(oe, "mouse,move", "*", video_obj_signal_frame_move_cb, oe);
681 681
682 edje_object_part_drag_value_set(oe, "video_speed", 0.0, 1.0); 682 edje_object_part_drag_value_set(oe, "video_alpha", 0.0, 1.0);
683 edje_object_part_text_set(oe, "video_speed_txt", "alpha 255"); 683 edje_object_part_text_set(oe, "video_alpha_txt", "alpha 255");
684 684
685 edje_object_part_drag_value_set(oe, "video_volume", 0.0, 0.5); 685 edje_object_part_drag_value_set(oe, "video_volume", 0.0, 0.5);
686 edje_object_part_text_set(oe, "video_volume_txt", "vol 0.50"); 686 edje_object_part_text_set(oe, "video_volume_txt", "vol 0.50");