summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavemds <dave@gurumeditation.it>2014-02-14 21:49:08 +0100
committerdavemds <dave@gurumeditation.it>2014-02-14 21:49:08 +0100
commit4f41c9890697aa06fd390b9713ed3946a5db1bc1 (patch)
tree8bb915803c6cc1c49bcabbfc2527f662d04e6b95
parent482ce33eb005f0cd17a4014c62e0121d5c7d0c32 (diff)
Emotion test: some small usability improvements.
* use different icons for play/pause/stop * alpha slider moved to the right * centered the progress text
-rw-r--r--src/Makefile_Emotion.am3
-rw-r--r--src/tests/emotion/data/icon_pause.pngbin0 -> 2168 bytes
-rw-r--r--src/tests/emotion/data/icon_play.pngbin0 -> 2134 bytes
-rw-r--r--src/tests/emotion/data/icon_stop.pngbin0 -> 1821 bytes
-rw-r--r--src/tests/emotion/data/theme.edc80
-rw-r--r--src/tests/emotion/emotion_test_main.c2
6 files changed, 44 insertions, 41 deletions
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index a95714acde..1e99250841 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -195,6 +195,9 @@ EMOTION_DATA_FILES = \
195tests/emotion/data/bpause.png \ 195tests/emotion/data/bpause.png \
196tests/emotion/data/bplay.png \ 196tests/emotion/data/bplay.png \
197tests/emotion/data/bstop.png \ 197tests/emotion/data/bstop.png \
198tests/emotion/data/icon_pause.png \
199tests/emotion/data/icon_play.png \
200tests/emotion/data/icon_stop.png \
198tests/emotion/data/e_logo.png \ 201tests/emotion/data/e_logo.png \
199tests/emotion/data/fr1.png \ 202tests/emotion/data/fr1.png \
200tests/emotion/data/fr2.png \ 203tests/emotion/data/fr2.png \
diff --git a/src/tests/emotion/data/icon_pause.png b/src/tests/emotion/data/icon_pause.png
new file mode 100644
index 0000000000..b5dbfee5a3
--- /dev/null
+++ b/src/tests/emotion/data/icon_pause.png
Binary files differ
diff --git a/src/tests/emotion/data/icon_play.png b/src/tests/emotion/data/icon_play.png
new file mode 100644
index 0000000000..b9b301cc15
--- /dev/null
+++ b/src/tests/emotion/data/icon_play.png
Binary files differ
diff --git a/src/tests/emotion/data/icon_stop.png b/src/tests/emotion/data/icon_stop.png
new file mode 100644
index 0000000000..c229cd8321
--- /dev/null
+++ b/src/tests/emotion/data/icon_stop.png
Binary files differ
diff --git a/src/tests/emotion/data/theme.edc b/src/tests/emotion/data/theme.edc
index a85e4befa0..0a4b1f6ba1 100644
--- a/src/tests/emotion/data/theme.edc
+++ b/src/tests/emotion/data/theme.edc
@@ -26,6 +26,9 @@ images {
26 image: "bplay.png" COMP; 26 image: "bplay.png" COMP;
27 image: "bstop.png" COMP; 27 image: "bstop.png" COMP;
28 image: "pnl.png" COMP; 28 image: "pnl.png" COMP;
29 image: "icon_pause.png" COMP;
30 image: "icon_play.png" COMP;
31 image: "icon_stop.png" COMP;
29} 32}
30 33
31collections { 34collections {
@@ -812,14 +815,14 @@ collections {
812 part { name: "video_speed_confine"; mouse_events: 0; type: RECT; 815 part { name: "video_speed_confine"; mouse_events: 0; type: RECT;
813 description { state: "default" 0.0; 816 description { state: "default" 0.0;
814 rel1 { 817 rel1 {
815 to: "video_frame_left"; 818 to: "video_frame_right";
816 relative: 1.0 0.0; 819 relative: 0.0 0.0;
817 offset: 0 24; 820 offset: 0 24;
818 } 821 }
819 rel2 { 822 rel2 {
820 to: "video_frame_left"; 823 to: "video_frame_right";
821 relative: 1.0 1.0; 824 relative: 0.5 1.0;
822 offset: 48 -49; 825 offset: 0 -48;
823 } 826 }
824 color: 0 0 0 0; 827 color: 0 0 0 0;
825 } 828 }
@@ -855,15 +858,15 @@ collections {
855 rel1 { 858 rel1 {
856 to: "video_frame_bottom"; 859 to: "video_frame_bottom";
857 relative: 0.0 0.5; 860 relative: 0.0 0.5;
858 offset: 0 0; 861 offset: 2 -20;
859 } 862 }
860 rel2 { 863 rel2 {
861 to: "video_frame_bottom"; 864 to: "video_frame_bottom";
862 relative: 0.0 0.5; 865 relative: 0.0 0.5;
863 offset: 0 0; 866 offset: 2 -20;
864 } 867 }
865 image { 868 image {
866 normal: "knob.png"; 869 normal: "icon_play.png";
867 } 870 }
868 } 871 }
869 } 872 }
@@ -874,15 +877,15 @@ collections {
874 rel1 { 877 rel1 {
875 to: "video_frame_bottom"; 878 to: "video_frame_bottom";
876 relative: 0.5 0.5; 879 relative: 0.5 0.5;
877 offset: 0 0; 880 offset: 0 -20;
878 } 881 }
879 rel2 { 882 rel2 {
880 to: "video_frame_bottom"; 883 to: "video_frame_bottom";
881 relative: 0.5 0.5; 884 relative: 0.5 0.5;
882 offset: 0 0; 885 offset: 0 -20;
883 } 886 }
884 image { 887 image {
885 normal: "knob.png"; 888 normal: "icon_pause.png";
886 } 889 }
887 } 890 }
888 } 891 }
@@ -893,15 +896,15 @@ collections {
893 rel1 { 896 rel1 {
894 to: "video_frame_bottom"; 897 to: "video_frame_bottom";
895 relative: 1.0 0.5; 898 relative: 1.0 0.5;
896 offset: 0 0; 899 offset: -2 -20;
897 } 900 }
898 rel2 { 901 rel2 {
899 to: "video_frame_bottom"; 902 to: "video_frame_bottom";
900 relative: 1.0 0.5; 903 relative: 1.0 0.5;
901 offset: 0 0; 904 offset: -2 -20;
902 } 905 }
903 image { 906 image {
904 normal: "knob.png"; 907 normal: "icon_stop.png";
905 } 908 }
906 } 909 }
907 } 910 }
@@ -938,15 +941,14 @@ collections {
938 part { name: "video_progress_txt"; type: TEXT; mouse_events: 0; 941 part { name: "video_progress_txt"; type: TEXT; mouse_events: 0;
939 effect: OUTLINE; 942 effect: OUTLINE;
940 description { state: "default" 0.0; 943 description { state: "default" 0.0;
941 align: 1.0 1.0;
942 fixed: 1 1; 944 fixed: 1 1;
943 rel1 { 945 rel1 {
944 relative: 1.0 1.0; 946 relative: 0.0 0.0;
945 offset: -2 -2; 947 offset: 0 0;
946 } 948 }
947 rel2 { 949 rel2 {
948 relative: 1.0 1.0; 950 relative: 1.0 1.0;
949 offset: -2 -2; 951 offset: 0 0;
950 } 952 }
951 color: 255 255 255 255; 953 color: 255 255 255 255;
952 color2: 0 0 0 255; 954 color2: 0 0 0 255;
@@ -954,7 +956,7 @@ collections {
954 text: "XX:XX:XX / XX:XX:XX"; 956 text: "XX:XX:XX / XX:XX:XX";
955 font: "Sans"; 957 font: "Sans";
956 size: 10; 958 size: 10;
957 align: 1.0 1.0; 959 align: 0.5 1.0;
958 min: 1 1; 960 min: 1 1;
959 }; 961 };
960 } 962 }
@@ -1225,14 +1227,14 @@ collections {
1225 part { name: "video_speed_confine"; mouse_events: 0; type: RECT; 1227 part { name: "video_speed_confine"; mouse_events: 0; type: RECT;
1226 description { state: "default" 0.0; 1228 description { state: "default" 0.0;
1227 rel1 { 1229 rel1 {
1228 to: "video_frame_left"; 1230 to: "video_frame_right";
1229 relative: 1.0 0.0; 1231 relative: 0.0 0.0;
1230 offset: 0 24; 1232 offset: 0 24;
1231 } 1233 }
1232 rel2 { 1234 rel2 {
1233 to: "video_frame_left"; 1235 to: "video_frame_right";
1234 relative: 1.0 1.0; 1236 relative: 0.5 1.0;
1235 offset: 48 -49; 1237 offset: 0 -48;
1236 } 1238 }
1237 color: 0 0 0 0; 1239 color: 0 0 0 0;
1238 } 1240 }
@@ -1268,35 +1270,34 @@ collections {
1268 rel1 { 1270 rel1 {
1269 to: "video_frame_bottom"; 1271 to: "video_frame_bottom";
1270 relative: 0.0 0.5; 1272 relative: 0.0 0.5;
1271 offset: 0 0; 1273 offset: 2 -20;
1272 } 1274 }
1273 rel2 { 1275 rel2 {
1274 to: "video_frame_bottom"; 1276 to: "video_frame_bottom";
1275 relative: 0.0 0.5; 1277 relative: 0.0 0.5;
1276 offset: 0 0; 1278 offset: 2 -20;
1277 } 1279 }
1278 image { 1280 image {
1279 normal: "knob.png"; 1281 normal: "icon_play.png";
1280 } 1282 }
1281 } 1283 }
1282 } 1284 }
1283 part { name: "video_pause"; 1285 part { name: "video_pause"; mouse_events: 1;
1284 mouse_events: 1;
1285 description { state: "default" 0.0; 1286 description { state: "default" 0.0;
1286 fixed: 1 1; 1287 fixed: 1 1;
1287 min: 24 24; 1288 min: 24 24;
1288 rel1 { 1289 rel1 {
1289 to: "video_frame_bottom"; 1290 to: "video_frame_bottom";
1290 relative: 0.5 0.5; 1291 relative: 0.5 0.5;
1291 offset: 0 0; 1292 offset: 0 -20;
1292 } 1293 }
1293 rel2 { 1294 rel2 {
1294 to: "video_frame_bottom"; 1295 to: "video_frame_bottom";
1295 relative: 0.5 0.5; 1296 relative: 0.5 0.5;
1296 offset: 0 0; 1297 offset: 0 -20;
1297 } 1298 }
1298 image { 1299 image {
1299 normal: "knob.png"; 1300 normal: "icon_pause.png";
1300 } 1301 }
1301 } 1302 }
1302 } 1303 }
@@ -1307,15 +1308,15 @@ collections {
1307 rel1 { 1308 rel1 {
1308 to: "video_frame_bottom"; 1309 to: "video_frame_bottom";
1309 relative: 1.0 0.5; 1310 relative: 1.0 0.5;
1310 offset: 0 0; 1311 offset: -2 -20;
1311 } 1312 }
1312 rel2 { 1313 rel2 {
1313 to: "video_frame_bottom"; 1314 to: "video_frame_bottom";
1314 relative: 1.0 0.5; 1315 relative: 1.0 0.5;
1315 offset: 0 0; 1316 offset: -2 -20;
1316 } 1317 }
1317 image { 1318 image {
1318 normal: "knob.png"; 1319 normal: "icon_stop.png";
1319 } 1320 }
1320 } 1321 }
1321 } 1322 }
@@ -1352,15 +1353,14 @@ collections {
1352 part { name: "video_progress_txt"; type: TEXT; mouse_events: 0; 1353 part { name: "video_progress_txt"; type: TEXT; mouse_events: 0;
1353 effect: OUTLINE; 1354 effect: OUTLINE;
1354 description { state: "default" 0.0; 1355 description { state: "default" 0.0;
1355 align: 1.0 1.0;
1356 fixed: 1 1; 1356 fixed: 1 1;
1357 rel1 { 1357 rel1 {
1358 relative: 1.0 1.0; 1358 relative: 0.0 0.0;
1359 offset: -2 -2; 1359 offset: 0 0;
1360 } 1360 }
1361 rel2 { 1361 rel2 {
1362 relative: 1.0 1.0; 1362 relative: 1.0 1.0;
1363 offset: -2 -2; 1363 offset: 0 0;
1364 } 1364 }
1365 color: 255 255 255 255; 1365 color: 255 255 255 255;
1366 color2: 0 0 0 255; 1366 color2: 0 0 0 255;
@@ -1368,7 +1368,7 @@ collections {
1368 text: "XX:XX:XX / XX:XX:XX"; 1368 text: "XX:XX:XX / XX:XX:XX";
1369 font: "Sans"; 1369 font: "Sans";
1370 size: 10; 1370 size: 10;
1371 align: 1.0 1.0; 1371 align: 0.5 1.0;
1372 min: 1 1; 1372 min: 1 1;
1373 }; 1373 };
1374 } 1374 }
diff --git a/src/tests/emotion/emotion_test_main.c b/src/tests/emotion/emotion_test_main.c
index 3f3ec667f3..2323e06da7 100644
--- a/src/tests/emotion/emotion_test_main.c
+++ b/src/tests/emotion/emotion_test_main.c
@@ -667,7 +667,7 @@ init_video_object(const char *module_filename, const char *filename)
667 edje_object_signal_callback_add(oe, "mouse,move", "*", video_obj_signal_frame_move_cb, oe); 667 edje_object_signal_callback_add(oe, "mouse,move", "*", video_obj_signal_frame_move_cb, oe);
668 668
669 edje_object_part_drag_value_set(oe, "video_speed", 0.0, 1.0); 669 edje_object_part_drag_value_set(oe, "video_speed", 0.0, 1.0);
670 edje_object_part_text_set(oe, "video_speed_txt", "1.0"); 670 edje_object_part_text_set(oe, "video_speed_txt", "255");
671 671
672 edje_object_signal_emit(o, "video_state", "play"); 672 edje_object_signal_emit(o, "video_state", "play");
673 673