From 4f41c9890697aa06fd390b9713ed3946a5db1bc1 Mon Sep 17 00:00:00 2001 From: davemds Date: Fri, 14 Feb 2014 21:49:08 +0100 Subject: [PATCH] Emotion test: some small usability improvements. * use different icons for play/pause/stop * alpha slider moved to the right * centered the progress text --- src/Makefile_Emotion.am | 3 + src/tests/emotion/data/icon_pause.png | Bin 0 -> 2168 bytes src/tests/emotion/data/icon_play.png | Bin 0 -> 2134 bytes src/tests/emotion/data/icon_stop.png | Bin 0 -> 1821 bytes src/tests/emotion/data/theme.edc | 80 +++++++++++++------------- src/tests/emotion/emotion_test_main.c | 2 +- 6 files changed, 44 insertions(+), 41 deletions(-) create mode 100644 src/tests/emotion/data/icon_pause.png create mode 100644 src/tests/emotion/data/icon_play.png create mode 100644 src/tests/emotion/data/icon_stop.png 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 = \ tests/emotion/data/bpause.png \ tests/emotion/data/bplay.png \ tests/emotion/data/bstop.png \ +tests/emotion/data/icon_pause.png \ +tests/emotion/data/icon_play.png \ +tests/emotion/data/icon_stop.png \ tests/emotion/data/e_logo.png \ tests/emotion/data/fr1.png \ tests/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 0000000000000000000000000000000000000000..b5dbfee5a30451c40d3c4fed7feea23a81258dfc GIT binary patch literal 2168 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 M07*qoM6N<$f)n`iXaE2J literal 0 HcmV?d00001 diff --git a/src/tests/emotion/data/icon_stop.png b/src/tests/emotion/data/icon_stop.png new file mode 100644 index 0000000000000000000000000000000000000000..c229cd8321f7999d1a4d3d5cf072524c8d4ef1c1 GIT binary patch literal 1821 zcmV+&2jcjNP)5{JL4oSu&?3MBIqbnX<^}u`+E>V9D0&{gL|$Nz)?p7i84wl%BFMBv z&P;dJ9%d*}vNwrHk#ey80|*iWV!Ha9>h9{9s)4MmtgNi8tgNi8tgNiRnB>{d=q}%O zkHw$!bj34K69%(>IUO#_34ECHO~Cx|80U1b&wa&pHiubk3=Y77Q-lx5hhw-rLuNlC z{M7$zaq%)BM@Ri-J^vXdf5Q*o;rtWfM;ynIy&MxPDX7`T?u6er3%3u4USTRr|m+NfYU(|Oa(J1 zmC&_Lr$Q5yrV2E_3Eh#>-9bFY*73si7Lilr66E?Vx`-5SYs%Y>aVQyUVlM>7(HIv> z1(Ya39QBBZY}pGPmw>Ba>LeAqXtZTu?uoevZf`sEZ3&mRy_a5|;hZAE(5rIa9xf?fLFbf@l z65527d)TPOW=GiZ0WyUr58>j;!*|eigVvXXQ9+T6T9rKsyjJH|WSAV}evY^c7y2JPTzaz7j0F+griXD4Nn4lm6=KZ%X zmADN#^M~hR%+V<_c*OS}4I1 zl?tOE?90#ty?4U9&uT}v@p*85xj(Ke-XDa0Eg6|o721be&3+%lu5)$Q-ifsP$g6-X zAOt84YLv0~SH|f#v^!49m`JTqwk2U~XnVE3h5FP5WU1~`?}4SGNeH48!Kt=3KA$Vd z7AjGSB!tq@R3hDYR{&Yr+kOYuAj!~BpyCt`<<=*<^+KEbpGGN85ehUJYQyemanWxK zc6&4775KcLYTQu)y)$7I(xUjV#hmTZ1Ba`0*Jur{2z`8~4?5!y zJGaw2h5vgb^wyTW?JND-4Z!2o33+h;<@RhDB>QRyMd!0F2GP!ErQ!|?4ZkA(fp4*0GgZGOcD zaXhWqyzIm7Jn(F2crrBH3|CZfbeW{c!~C|PWAeCz+k^*S&wW!2?enN<9`x%4hVW;Q zV#rB0One2PeM1w~Lk~1HOe;)^z8vDt8FmG5bkrBIXpINOQp8+{0^QaVh&J?0Q92i5 zidaxghao&V!l!3X2dV2CQohDRhj)SnC%F-m(EiZ`zVo!VM+;eUS~p^FQYTpG@N&Lm z4+N-g@VR1@lYma43C8>`%lK=lW-sBHkMeVZG1r2IlCE;nT(Rn4#{ef6czu9Z0gFb$ z>8xOpl$$$n@`BKQ#~YJ!W3Zs5i$vbY>mnQk9#;OC-{Dv4>8W(Oo5-jjuj0v!h zGxnic$sJX8P-x>rp^ab+g*FItoEukWlK4c)ZBUw25l3L7Vl`&icBz-Z^cVa+_{RpT z194o_+;)8}Tp6)g&?tOXrv^$Bf;#GkY#pHD!Ex(r*Ur1*bn3B8Gif@JHLXXsxRCt_b{0e%bI2pDGDV-L#u#zL@aH8 zI`jnUcoFb+D0f}hQ103g(}eERE%E4ax$7FkcZ2mY7hFF>fRRi7pCLlKe_O{AB*ATn@13$dPr^_26C#!Ma`t<`FX6cLH6*%;_vi!$o#pCj| zC+9C1IG+Ot4_|vSeI{_*+avs+y?7@pD=RB2D=RB2D=RDOFQ@+kd_S9Cm@~g@00000 LNkvXXu0mjf!((Zu literal 0 HcmV?d00001 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 { image: "bplay.png" COMP; image: "bstop.png" COMP; image: "pnl.png" COMP; + image: "icon_pause.png" COMP; + image: "icon_play.png" COMP; + image: "icon_stop.png" COMP; } collections { @@ -812,14 +815,14 @@ collections { part { name: "video_speed_confine"; mouse_events: 0; type: RECT; description { state: "default" 0.0; rel1 { - to: "video_frame_left"; - relative: 1.0 0.0; + to: "video_frame_right"; + relative: 0.0 0.0; offset: 0 24; } rel2 { - to: "video_frame_left"; - relative: 1.0 1.0; - offset: 48 -49; + to: "video_frame_right"; + relative: 0.5 1.0; + offset: 0 -48; } color: 0 0 0 0; } @@ -855,15 +858,15 @@ collections { rel1 { to: "video_frame_bottom"; relative: 0.0 0.5; - offset: 0 0; + offset: 2 -20; } rel2 { to: "video_frame_bottom"; relative: 0.0 0.5; - offset: 0 0; + offset: 2 -20; } image { - normal: "knob.png"; + normal: "icon_play.png"; } } } @@ -874,15 +877,15 @@ collections { rel1 { to: "video_frame_bottom"; relative: 0.5 0.5; - offset: 0 0; + offset: 0 -20; } rel2 { to: "video_frame_bottom"; relative: 0.5 0.5; - offset: 0 0; + offset: 0 -20; } image { - normal: "knob.png"; + normal: "icon_pause.png"; } } } @@ -893,15 +896,15 @@ collections { rel1 { to: "video_frame_bottom"; relative: 1.0 0.5; - offset: 0 0; + offset: -2 -20; } rel2 { to: "video_frame_bottom"; relative: 1.0 0.5; - offset: 0 0; + offset: -2 -20; } image { - normal: "knob.png"; + normal: "icon_stop.png"; } } } @@ -938,15 +941,14 @@ collections { part { name: "video_progress_txt"; type: TEXT; mouse_events: 0; effect: OUTLINE; description { state: "default" 0.0; - align: 1.0 1.0; fixed: 1 1; rel1 { - relative: 1.0 1.0; - offset: -2 -2; + relative: 0.0 0.0; + offset: 0 0; } rel2 { relative: 1.0 1.0; - offset: -2 -2; + offset: 0 0; } color: 255 255 255 255; color2: 0 0 0 255; @@ -954,7 +956,7 @@ collections { text: "XX:XX:XX / XX:XX:XX"; font: "Sans"; size: 10; - align: 1.0 1.0; + align: 0.5 1.0; min: 1 1; }; } @@ -1225,14 +1227,14 @@ collections { part { name: "video_speed_confine"; mouse_events: 0; type: RECT; description { state: "default" 0.0; rel1 { - to: "video_frame_left"; - relative: 1.0 0.0; + to: "video_frame_right"; + relative: 0.0 0.0; offset: 0 24; } rel2 { - to: "video_frame_left"; - relative: 1.0 1.0; - offset: 48 -49; + to: "video_frame_right"; + relative: 0.5 1.0; + offset: 0 -48; } color: 0 0 0 0; } @@ -1268,35 +1270,34 @@ collections { rel1 { to: "video_frame_bottom"; relative: 0.0 0.5; - offset: 0 0; + offset: 2 -20; } rel2 { to: "video_frame_bottom"; relative: 0.0 0.5; - offset: 0 0; + offset: 2 -20; } image { - normal: "knob.png"; + normal: "icon_play.png"; } } } - part { name: "video_pause"; - mouse_events: 1; + part { name: "video_pause"; mouse_events: 1; description { state: "default" 0.0; fixed: 1 1; min: 24 24; rel1 { to: "video_frame_bottom"; relative: 0.5 0.5; - offset: 0 0; + offset: 0 -20; } rel2 { to: "video_frame_bottom"; relative: 0.5 0.5; - offset: 0 0; + offset: 0 -20; } image { - normal: "knob.png"; + normal: "icon_pause.png"; } } } @@ -1307,15 +1308,15 @@ collections { rel1 { to: "video_frame_bottom"; relative: 1.0 0.5; - offset: 0 0; + offset: -2 -20; } rel2 { to: "video_frame_bottom"; relative: 1.0 0.5; - offset: 0 0; + offset: -2 -20; } image { - normal: "knob.png"; + normal: "icon_stop.png"; } } } @@ -1352,15 +1353,14 @@ collections { part { name: "video_progress_txt"; type: TEXT; mouse_events: 0; effect: OUTLINE; description { state: "default" 0.0; - align: 1.0 1.0; fixed: 1 1; rel1 { - relative: 1.0 1.0; - offset: -2 -2; + relative: 0.0 0.0; + offset: 0 0; } rel2 { relative: 1.0 1.0; - offset: -2 -2; + offset: 0 0; } color: 255 255 255 255; color2: 0 0 0 255; @@ -1368,7 +1368,7 @@ collections { text: "XX:XX:XX / XX:XX:XX"; font: "Sans"; size: 10; - align: 1.0 1.0; + align: 0.5 1.0; min: 1 1; }; } 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) 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", "1.0"); + edje_object_part_text_set(oe, "video_speed_txt", "255"); edje_object_signal_emit(o, "video_state", "play");