rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=0f4c2f315b26f7d6cc5ba93d0c4b96bbe195c618
commit 0f4c2f315b26f7d6cc5ba93d0c4b96bbe195c618
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Tue Jan 26 15:57:54 2016 +0200
sound_editor: reuse the image editor layout
Change-Id: Ia397a0e4a6e0617100f6668d208cb5093f3ea76c
---
data/themes/default/widgets/layout.edc | 104 +--------------------------------
src/bin/ui/editors/sound_editor.c | 8 +--
2 files changed, 6 insertions(+), 106 deletions(-)
diff --git a/data/themes/default/widgets/layout.edc
b/data/themes/default/widgets/layout.edc
index 4f8e4bf..245d25c 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -1029,8 +1029,8 @@ group { name: "elm/layout/animator/program_area";
#define BTNS_LARGE_SIZE_SET SET_SIZE(80, 25)
#define BTNS_SMALL_SIZE_SET SET_SIZE(30, 22)
-
-group { name: "elm/layout/image_manager/default";
+group { name: "elm/layout/image_editor/default";
+ alias: "elm/layout/sound_editor/default";
parts {
part { name: "area.edit";
type: SPACER;
@@ -1220,106 +1220,6 @@ group { name: "elm/layout/image_manager/usage_info";
}
}
-group { name: "elm/layout/sound_editor/default";
- parts {
- part { name: "area.edit";
- type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- align: 1.0 0.0;
- fixed: 1 1;
- min: 37 25;
- max: -1 25;
- rel1 {
- offset: 0 2;
- }
- rel2 {
- relative: 1.0 0.0;
- }
- }
- }
- part { name: "padding.edit_area";
- type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- align: 0.0 1.0;
- FIXED_SIZE(5, 5);
- rel2 {
- relative: 0.0 1.0;
- to: "area.edit";
- }
- }
- }
- part { name: "gengrid";
- type: SWALLOW;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1 {
- relative: 0.0 1.0;
- to_y: "area.edit";
- }
- }
- }
- part { name: "swallow.search_area";
- type: SWALLOW;
- scale: 1;
- description { state: "default" 0.0;
- align: 0.0 0.5;
- min: 100 30;
- max: 350 30;
- fixed: 1 1;
- rel1.to: "area.edit";
- rel2 {
- relative: 0.6 1.0;
- to: "area.edit";
- }
- }
- }
- part { name: "swallow.btn.add";
- type: SWALLOW;
- scale: 1;
- description { state: "default" 0.0;
- align: 1.0 0.5;
- FIXED_SIZE(31, 21);
- rel1.to_y: "area.edit";
- rel2.to: "area.edit";
- }
- }
- part { name: "btn_spacer";
- type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- FIXED_SIZE(5, 5);
- rel2 {
- relative: 0.0 1.0;
- to: "swallow.btn.add";
- }
- }
- }
- part { name: "swallow.btn.del";
- type: SWALLOW;
- scale: 1;
- description { state: "default" 0.0;
- align: 1.0 0.5;
- SET_SIZE(31, 21);
- rel1 {
- relative: 1.0 0.0;
- offset: 10 0;
- to_x: "swallow.search_area";
- to_y: "area.edit";
- }
- rel2 {
- relative: 0.0 1.0;
- to_x: "btn_spacer";
- to_y: "area.edit";
- }
- }
- }
- }
-}
-
group { name: "elm/layout/sound_editor/player";
parts {
part { name: "padding.top";
diff --git a/src/bin/ui/editors/sound_editor.c
b/src/bin/ui/editors/sound_editor.c
index 5b5f7e3..8e09bfc 100644
--- a/src/bin/ui/editors/sound_editor.c
+++ b/src/bin/ui/editors/sound_editor.c
@@ -238,7 +238,7 @@ _create_gengrid(Evas_Object *parent, Sound_Editor *editor)
_gengrid_content_fill(editor);
evas_object_show(editor->gengrid);
- elm_object_part_content_set(editor->markup, "gengrid", editor->gengrid);
+ elm_object_part_content_set(editor->markup, "eflete.swallow.grid",
editor->gengrid);
}
static inline Evas_Object *
@@ -644,7 +644,7 @@ _sound_editor_main_markup_create(Sound_Editor *edit)
edit->btn_del = elm_button_add(edit->markup);
evas_object_smart_callback_add(edit->btn_del, "clicked",
_on_delete_clicked_cb, edit);
- elm_object_part_content_set(edit->markup, "swallow.btn.del", edit->btn_del);
+ elm_object_part_content_set(edit->markup, "eflete.swallow.del_btn",
edit->btn_del);
ic = elm_icon_add(edit->btn_del);
elm_icon_standard_set(ic, "minus");
@@ -656,11 +656,11 @@ _sound_editor_main_markup_create(Sound_Editor *edit)
ewe_combobox_item_add(edit->add_cmb, _("Sample"));
ewe_combobox_item_add(edit->add_cmb, _("Tone"));
evas_object_smart_callback_add(edit->add_cmb, "selected", _on_cmb_sel,
edit);
- elm_object_part_content_set(edit->markup, "swallow.btn.add", edit->add_cmb);
+ elm_object_part_content_set(edit->markup, "eflete.swallow.add_btn",
edit->add_cmb);
search = _sound_editor_search_field_create(edit->markup);
evas_object_hide(search);
- elm_layout_content_set(edit->markup, "swallow.search_area", search);
+ elm_layout_content_set(edit->markup, "eflete.swallow.search_area", search);
evas_object_smart_callback_add(search, "changed", _search_changed, edit);
evas_object_smart_callback_add(search, "activated", _search_nxt_gd_item,
edit);
evas_object_smart_callback_add(edit->gengrid, "pressed", _search_reset_cb,
--
