enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Emotion test: some small usability improvements. 

* use different icons for play/pause/stop
* alpha slider moved to the right
* centered the progress text
This commit is contained in:
Davide Andreoli 2014-02-14 21:49:08 +01:00
parent 482ce33eb0
commit 4f41c98906
6 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile_Emotion.am
View File

@ -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 \

BIN
src/tests/emotion/data/icon_pause.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/tests/emotion/data/icon_play.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/tests/emotion/data/icon_stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

80
src/tests/emotion/data/theme.edc
View File

@ -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;
};
}

2
src/tests/emotion/emotion_test_main.c
View File

@ -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");