rimmed pushed a commit to branch eflete-1.18. http://git.enlightenment.org/tools/eflete.git/commit/?id=36d0bb4a397a33ec6245d2acd4c8633842d0e188
commit 36d0bb4a397a33ec6245d2acd4c8633842d0e188 Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Mon Feb 13 09:46:09 2017 +0200 sound_editor: make preview for sound in the player Fixes T5152 @fix Change-Id: Ibb9f6751ca2137e78e50998185fac89678df57ff --- data/themes/default/widgets/layout.edc | 33 +++++++++++++++++++++++++++------ src/bin/ui/sound_manager.c | 6 ++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/data/themes/default/widgets/layout.edc b/data/themes/default/widgets/layout.edc index acf910c..8413081 100644 --- a/data/themes/default/widgets/layout.edc +++ b/data/themes/default/widgets/layout.edc @@ -939,16 +939,37 @@ group { name: "elm/layout/image_manager/usage_info"; group { name: "elm/layout/sound_editor/player"; parts { - part { name: "eflete.swallow.teg"; - type: SWALLOW; - description { state: "default" 0.0; - fixed: 1 1; + part { name: "eflete.sound.type"; + type: TEXT; + description { state: "default" 0.00; + align: 0.00 0.00; + color_class: "main"; + text { + font: "PT"; + size: 10; + min: 0 1; + max: 0 1; + } + rel1.offset: 3 3; + rel2.offset: -4 -1; + } + } + part { name: "eflete.sound.value"; + type: TEXT; + description { state: "default" 0.00; + color_class: "select"; + text { + font: "PT:style=Bold"; + size: 42; + } rel1 { + relative: 0.00 1.00; offset: 3 3; + to_y: "eflete.sound.type"; } rel2 { - relative: 1.0 0.0; - offset: -4 -7; + relative: 1.00 0.00; + offset: -4 -4; to_y: "eflete.swallow.fast"; } } diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c index edf793a..e5018e0 100644 --- a/src/bin/ui/sound_manager.c +++ b/src/bin/ui/sound_manager.c @@ -141,13 +141,16 @@ _grid_sel_cb(void *data __UNUSED__, request.name = snd->name; request.resource_type = RESOURCE_TYPE_SOUND; res = (External_Resource *)resource_get(ap.project->sounds, &request); + elm_layout_text_set(mng.player, "eflete.sound.type", _("sample")); break; case SOUND_TYPE_TONE: request.name = snd->name; request.resource_type = RESOURCE_TYPE_TONE; res = (External_Resource *)resource_get(ap.project->tones, &request); + elm_layout_text_set(mng.player, "eflete.sound.type", _("tone")); break; } + elm_layout_text_set(mng.player, "eflete.sound.value", snd->type_label); assert(res != NULL); @@ -527,6 +530,9 @@ _mw_cancel_cb(void *data __UNUSED__, { Evas_Object *content; + elm_layout_text_set(mng.player, "eflete.sound.value", NULL); + elm_layout_text_set(mng.player, "eflete.sound.type", NULL); + /* unset and hide the image property */ content = elm_object_content_unset(mng.win); evas_object_hide(content); --