rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=2e763948d6a4a05ba726152665269989cff54dbf
commit 2e763948d6a4a05ba726152665269989cff54dbf
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Mon May 16 18:22:33 2016 +0300
eflete: move managers property to modal window
Change-Id: Idbd1a5af3be7d57b03d24f232f9b7f79bab3203b
---
src/bin/ui/colorclass_manager.c | 36 ++++++++++++++++++++-
src/bin/ui/image_manager.c | 36 ++++++++++++++++++++-
src/bin/ui/sound_manager.c | 36 ++++++++++++++++++++-
src/bin/ui/style_manager.c | 71 ++++++++++++++++++++++++++++++-----------
4 files changed, 157 insertions(+), 22 deletions(-)
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index ecdcd8d..bf29b2c 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -39,6 +39,7 @@ struct _Search_Data
struct _Colorclasses_Manager
{
Evas_Object *win;
+ Evas_Object *panes;
Evas_Object *layout;
Evas_Object *genlist;
Evas_Object *edje_preview, *preview_layout;
@@ -355,6 +356,34 @@ _radio_switcher_add(Colorclasses_Manager *edit,
}
static void
+_property_hide(Colorclasses_Manager *mng)
+{
+ Evas_Object *content;
+
+ /* unset and hide the image property */
+ content = elm_object_part_content_unset(mng->panes, "right");
+ evas_object_hide(content);
+}
+
+static void
+_mw_cancel(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Colorclasses_Manager *mng = data;
+ _property_hide(mng);
+}
+
+static void
+_mw_done(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Colorclasses_Manager *mng = data;
+ _property_hide(mng);
+}
+
+static void
_colorclass_main_layout_create(Colorclasses_Manager *edit)
{
Evas_Object *bg, *box_bg, *layout_bg, *search, *ic, *button;
@@ -372,6 +401,8 @@ _colorclass_main_layout_create(Colorclasses_Manager *edit)
/* Creating main layout of window */
edit->win = mw_add();
mw_title_set(edit->win, _("Color class manager"));
+ evas_object_smart_callback_add(edit->win, "cancel", _mw_cancel, edit);
+ evas_object_smart_callback_add(edit->win, "done", _mw_done, edit);
ic = elm_icon_add(edit->win);
elm_icon_standard_set(ic, "color");
mw_icon_set(edit->win, ic);
@@ -379,7 +410,10 @@ _colorclass_main_layout_create(Colorclasses_Manager *edit)
elm_layout_theme_set(edit->layout, "layout", "colorclass_manager",
"default");
elm_layout_text_set(edit->layout, "elm.text", _("Preview"));
elm_layout_text_set(edit->layout, "elm.subtext", _("Color classes list"));
- elm_object_content_set(edit->win, edit->layout);
+ edit->panes = elm_panes_add(edit->win);
+ elm_object_content_set(edit->win, edit->panes);
+ elm_object_part_content_set(edit->panes, "left", edit->layout);
+ elm_object_part_content_set(edit->panes, "right",
ap.property.color_manager);
edit->genlist = elm_genlist_add(edit->layout);
evas_object_show(edit->genlist);
diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c
index d0422d5..e850b4e 100644
--- a/src/bin/ui/image_manager.c
+++ b/src/bin/ui/image_manager.c
@@ -55,6 +55,7 @@ struct _Search_Data
struct _Image_Manager
{
Evas_Object *win;
+ Evas_Object *panes;
Evas_Object *gengrid;
Evas_Object *layout;
Evas_Object *del_button;
@@ -481,6 +482,34 @@ _image_manager_init(Image_Manager *img_mng)
return true;
}
+static void
+_property_hide(Image_Manager *mng)
+{
+ Evas_Object *content;
+
+ /* unset and hide the image property */
+ content = elm_object_part_content_unset(mng->panes, "right");
+ evas_object_hide(content);
+}
+
+static void
+_mw_cancel(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Image_Manager *mng = data;
+ _property_hide(mng);
+}
+
+static void
+_mw_done(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Image_Manager *mng = data;
+ _property_hide(mng);
+}
+
Evas_Object *
image_manager_add()
{
@@ -494,12 +523,17 @@ image_manager_add()
img_mng->win = mw_add();
mw_title_set(img_mng->win, _("Image manager"));
+ evas_object_smart_callback_add(img_mng->win, "cancel", _mw_cancel, img_mng);
+ evas_object_smart_callback_add(img_mng->win, "done", _mw_done, img_mng);
ic = elm_icon_add(img_mng->win);
elm_icon_standard_set(ic, "image2");
mw_icon_set(img_mng->win, ic);
img_mng->layout = elm_layout_add(img_mng->win);
elm_layout_theme_set(img_mng->layout, "layout", "image_manager", "default");
- elm_object_content_set(img_mng->win, img_mng->layout);
+ img_mng->panes = elm_panes_add(img_mng->win);
+ elm_object_content_set(img_mng->win, img_mng->panes);
+ elm_object_part_content_set(img_mng->panes, "left", img_mng->layout);
+ elm_object_part_content_set(img_mng->panes, "right",
ap.property.image_manager);
img_mng->gengrid = elm_gengrid_add(img_mng->layout);
elm_object_part_content_set(img_mng->layout,
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index b46358d..9d6e8f1 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -49,6 +49,7 @@ struct _Search_Data
struct _Sound_Editor
{
Evas_Object *win;
+ Evas_Object *panes;
Evas_Object *popup;
Evas_Object *popup_btn_add;
Evas_Object *btn_add;
@@ -596,6 +597,34 @@ _search_reset_cb(void *data __UNUSED__,
}
static void
+_property_hide(Sound_Editor *mng)
+{
+ Evas_Object *content;
+
+ /* unset and hide the image property */
+ content = elm_object_part_content_unset(mng->panes, "right");
+ evas_object_hide(content);
+}
+
+static void
+_mw_cancel(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Sound_Editor *mng = data;
+ _property_hide(mng);
+}
+
+static void
+_mw_done(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Sound_Editor *mng = data;
+ _property_hide(mng);
+}
+
+static void
_sound_editor_main_markup_create(Sound_Editor *edit)
{
Evas_Object *ic, *search;
@@ -604,6 +633,8 @@ _sound_editor_main_markup_create(Sound_Editor *edit)
edit->win = mw_add();
mw_title_set(edit->win, _("Sound manager"));
+ evas_object_smart_callback_add(edit->win, "cancel", _mw_cancel, edit);
+ evas_object_smart_callback_add(edit->win, "done", _mw_done, edit);
ic = elm_icon_add(edit->win);
elm_icon_standard_set(ic, "sound2");
mw_icon_set(edit->win, ic);
@@ -611,7 +642,10 @@ _sound_editor_main_markup_create(Sound_Editor *edit)
elm_layout_theme_set(edit->markup, "layout", "sound_manager", "default");
evas_object_size_hint_weight_set(edit->markup, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_data_set(edit->win, SND_EDIT_KEY, edit);
- elm_object_content_set(edit->win, edit->markup);
+ edit->panes = elm_panes_add(edit->win);
+ elm_object_content_set(edit->win, edit->panes);
+ elm_object_part_content_set(edit->panes, "left", edit->markup);
+ elm_object_part_content_set(edit->panes, "right",
ap.property.sound_manager);
edit->btn_del = elm_button_add(edit->markup);
elm_object_style_set(edit->btn_del, "minus");
diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c
index eb83a3f..8c08a85 100644
--- a/src/bin/ui/style_manager.c
+++ b/src/bin/ui/style_manager.c
@@ -61,6 +61,8 @@ struct _Search_Data
struct _Style_Editor
{
Evas_Object *win;
+ Evas_Object *layout;
+ Evas_Object *panes;
Evas_Object *glist;
Evas_Object *textblock_style;
Evas_Object *entry_prev;
@@ -908,10 +910,37 @@ _on_style_manager_close(void *data,
free(style_edit);
}
+static void
+_property_hide(Style_Editor *mng)
+{
+ Evas_Object *content;
+
+ /* unset and hide the image property */
+ content = elm_object_part_content_unset(mng->panes, "right");
+ evas_object_hide(content);
+}
+
+static void
+_mw_cancel(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Style_Editor *mng = data;
+ _property_hide(mng);
+}
+
+static void
+_mw_done(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Style_Editor *mng = data;
+ _property_hide(mng);
+}
+
Evas_Object *
style_manager_add()
{
- Evas_Object *main_layout;
Evas_Object *bg, *box_bg;
Evas *canvas;
Elm_Object_Item *glit_style;
@@ -928,17 +957,21 @@ style_manager_add()
style_edit->win = mw_add();
mw_title_set(style_edit->win, _("Textblock style manager"));
+ evas_object_smart_callback_add(style_edit->win, "cancel", _mw_cancel,
style_edit);
+ evas_object_smart_callback_add(style_edit->win, "done", _mw_done,
style_edit);
ic = elm_icon_add(style_edit->win);
elm_icon_standard_set(ic, "text2");
mw_icon_set(style_edit->win, ic);
-
- main_layout = elm_layout_add(ap.win);
- elm_layout_theme_set(main_layout, "layout", "style_manager", "default");
- elm_object_part_text_set(main_layout, "elm.text", _("Preview"));
- elm_layout_text_set(main_layout, "elm.subtext", _("Font list"));
- elm_object_content_set(style_edit->win, main_layout);
-
- style_edit->entry_prev = elm_layout_add(main_layout);
+ style_edit->layout = elm_layout_add(ap.win);
+ elm_layout_theme_set(style_edit->layout, "layout", "style_manager",
"default");
+ elm_object_part_text_set(style_edit->layout, "elm.text", _("Preview"));
+ elm_layout_text_set(style_edit->layout, "elm.subtext", _("Font list"));
+ style_edit->panes = elm_panes_add(style_edit->win);
+ elm_object_content_set(style_edit->win, style_edit->panes);
+ elm_object_part_content_set(style_edit->panes, "left", style_edit->layout);
+ elm_object_part_content_set(style_edit->panes, "right",
ap.property.style_manager);
+
+ style_edit->entry_prev = elm_layout_add(style_edit->layout);
elm_layout_theme_set(style_edit->entry_prev, "layout", "style_manager",
"preview");
evas_object_show(style_edit->entry_prev);
elm_object_signal_emit(style_edit->entry_prev, "entry,hide", "eflete");
@@ -946,7 +979,7 @@ style_manager_add()
canvas = evas_object_evas_get(ap.win);
/* Entry preview to show colorclass */
- bg = elm_layout_add(main_layout);
+ bg = elm_layout_add(style_edit->layout);
elm_layout_theme_set(bg, "layout", "workspace", "bg");
elm_object_part_content_set(style_edit->entry_prev, "background", bg);
@@ -958,7 +991,7 @@ style_manager_add()
evas_object_textblock_style_set(style_edit->textblock_style, ts);
evas_object_textblock_text_markup_set(style_edit->textblock_style,
TEST_TEXT);
evas_object_show(style_edit->textblock_style);
- elm_object_part_content_set(main_layout, "elm.swallow.preview",
style_edit->entry_prev);
+ elm_object_part_content_set(style_edit->layout, "elm.swallow.preview",
style_edit->entry_prev);
if (!_itc_style)
{
@@ -979,16 +1012,16 @@ style_manager_add()
_itc_tags->func.del = NULL;
}
- search = _style_manager_search_field_create(main_layout);
- elm_object_part_content_set(main_layout, "elm.swallow.search", search);
+ search = _style_manager_search_field_create(style_edit->layout);
+ elm_object_part_content_set(style_edit->layout, "elm.swallow.search",
search);
evas_object_smart_callback_add(search, "changed", _search_changed,
style_edit);
evas_object_smart_callback_add(search, "activated", _search_nxt_gd_item,
style_edit);
evas_object_smart_callback_add(style_edit->glist, "pressed",
_search_reset_cb, &(style_edit->style_search_data));
style_edit->style_search_data.search_entry = search;
style_edit->style_search_data.last_item_found = NULL;
- style_edit->glist = elm_genlist_add(main_layout);
- elm_object_part_content_set(main_layout, "elm.swallow.list",
style_edit->glist);
+ style_edit->glist = elm_genlist_add(style_edit->layout);
+ elm_object_part_content_set(style_edit->layout, "elm.swallow.list",
style_edit->glist);
evas_object_smart_callback_add(style_edit->glist, "expand,request",
_expand_request_cb, NULL);
evas_object_smart_callback_add(style_edit->glist, "expanded", _expanded_cb,
style_edit);
evas_object_smart_callback_add(style_edit->glist, "contract,request",
_contract_request_cb, NULL);
@@ -1014,19 +1047,19 @@ style_manager_add()
button_add = elm_button_add(ap.win);
elm_object_style_set(button_add, "plus");
evas_object_smart_callback_add(button_add, "clicked", _on_bt_add,
style_edit);
- elm_object_part_content_set(main_layout, "elm.swallow.btn_add", button_add);
+ elm_object_part_content_set(style_edit->layout, "elm.swallow.btn_add",
button_add);
style_edit->button_del = elm_button_add(ap.win);
elm_object_style_set(style_edit->button_del, "minus");
evas_object_smart_callback_add(style_edit->button_del, "clicked",
_on_bt_del, style_edit);
- elm_object_part_content_set(main_layout, "elm.swallow.btn_del",
style_edit->button_del);
+ elm_object_part_content_set(style_edit->layout, "elm.swallow.btn_del",
style_edit->button_del);
elm_object_disabled_set(style_edit->button_del, true);
box_bg = _add_box_bg(style_edit);
- elm_object_part_content_set(main_layout, "elm.swallow.menu", box_bg);
+ elm_object_part_content_set(style_edit->layout, "elm.swallow.menu", box_bg);
evas_textblock_style_free(ts);
- evas_object_event_callback_add(main_layout, EVAS_CALLBACK_DEL,
_on_style_manager_close, style_edit);
+ evas_object_event_callback_add(style_edit->layout, EVAS_CALLBACK_DEL,
_on_style_manager_close, style_edit);
evas_object_smart_callback_call(ap.win, SIGNAL_STYLE_SELECTED, NULL);
--
