rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=ae3cfab9dc3fbc346c1ef5c1f907620a083c0fc8
commit ae3cfab9dc3fbc346c1ef5c1f907620a083c0fc8 Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Thu May 12 16:20:22 2016 +0300 image_manager: move to modal window The image manager have not property now, it will be added soon Change-Id: Ic3832710bf349bd2abd119bbd04b714442adf863 --- src/bin/ui/image_manager.c | 16 ++++++++++------ src/bin/ui/menu.c | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c index 22bd011..8fea084 100644 --- a/src/bin/ui/image_manager.c +++ b/src/bin/ui/image_manager.c @@ -19,6 +19,7 @@ #include "main_window.h" #include "project_manager.h" +#include "modal_window.h" #define ITEM_WIDTH 100 #define ITEM_HEIGHT 115 @@ -491,8 +492,14 @@ image_manager_add() Image_Manager *img_mng = (Image_Manager *)mem_calloc(1, sizeof(Image_Manager)); - img_mng->layout = elm_layout_add(ap.win); + img_mng->win = mw_add(NULL, NULL); + mw_title_set(img_mng->win, _("Image manager")); + 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->gengrid = elm_gengrid_add(img_mng->layout); elm_object_part_content_set(img_mng->layout, @@ -570,9 +577,6 @@ image_manager_add() ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, true); evas_object_event_callback_add(img_mng->layout, EVAS_CALLBACK_DEL, _on_image_manager_del, img_mng); - return img_mng->layout; + evas_object_show(img_mng->win); + return img_mng->win; } - -#undef ITEM_WIDTH -#undef ITEM_HEIGHT -#undef IMG_MANAGER_KEY diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c index 183153f..532f96a 100644 --- a/src/bin/ui/menu.c +++ b/src/bin/ui/menu.c @@ -182,7 +182,7 @@ _menu_cb(void *data __UNUSED__, tabs_home_tab_add(TAB_HOME_OPEN_PROJECT); break; case MENU_WINDOW_MANAGER_IMAGE: - //tabs_menu_tab_open(TAB_IMAGE_EDITOR); + image_manager_add(); break; case MENU_WINDOW_MANAGER_SOUND: //tabs_menu_tab_open(TAB_SOUND_EDITOR); --