nikawhite pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=2a4ea49b69c85cfa6716d4f037e9e1cd72c99ac7
commit 2a4ea49b69c85cfa6716d4f037e9e1cd72c99ac7 Author: Mykyta Biliavskyi <[email protected]> Date: Wed Jul 27 19:24:52 2016 +0300 Tizen theme: add title icon into managers inwin. --- data/themes/tizen/widgets/image.edc | 2 ++ data/themes/tizen/widgets/inwin.edc | 9 --------- src/bin/ui/colorclass_manager.c | 6 +++++- src/bin/ui/image_manager.c | 4 ++++ src/bin/ui/sound_manager.c | 6 +++++- src/bin/ui/style_manager.c | 5 +++++ 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/data/themes/tizen/widgets/image.edc b/data/themes/tizen/widgets/image.edc index fe3203d..ef33070 100644 --- a/data/themes/tizen/widgets/image.edc +++ b/data/themes/tizen/widgets/image.edc @@ -71,6 +71,8 @@ IM("icon", "group_navigator_sel","Group contents navigator/view_s_group_sel. IM("icon", "group_navigator_mv", "Group contents navigator/view_s_group_mv.png", 16 16, 0 0 0 0, SCALE, SOLID) IM("icon", "external", "Custom/icon-external.png", 12 11, 0 0 0 0, SCALE, SOLID) +IM("icon", "logo", "General/cd_icon.png", 16 16, 0 0 0 0, SCALE, SOLID) + IM("icon", "attention", "Custom/attention.png", 16 16, 0 0 0 0, SCALE, SOLID) IM("icon", "alias_link", "WYSIWG/tool_loop_nor.png", 16 16, 0 0 0 0, SCALE, SOLID) diff --git a/data/themes/tizen/widgets/inwin.edc b/data/themes/tizen/widgets/inwin.edc index c468001..268d1cf 100644 --- a/data/themes/tizen/widgets/inwin.edc +++ b/data/themes/tizen/widgets/inwin.edc @@ -87,7 +87,6 @@ group { name: "elm/win/inwin/modal_window"; } part { name: "elm.swallow.icon"; type: SWALLOW; - clip_to: "icon_painter"; description { state: "default" 0.0; align: 0.0 0.5; fixed: 1 0; @@ -101,14 +100,6 @@ group { name: "elm/win/inwin/modal_window"; rel2.to_y: "elm.text.title"; } } - part { name: "icon_painter"; - type: RECT; - description { state: "default" 0.0; - color: 0 138 237 255; - rel1.to: "elm.swallow.icon"; - rel2.to: "elm.swallow.icon"; - } - } part { name: "elm.swallow.close"; type: SWALLOW; description { state: "default" 0.0; diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c index 56e34cf..7a859ce 100644 --- a/src/bin/ui/colorclass_manager.c +++ b/src/bin/ui/colorclass_manager.c @@ -439,8 +439,12 @@ colorclass_manager_add(void) mw_title_set(mng.win, _("Color class manager")); evas_object_smart_callback_add(mng.win, "cancel", _mw_cancel_cb, NULL); evas_object_smart_callback_add(mng.win, "done", _mw_done_cb, NULL); +#if !HAVE_TIZEN ic = elm_icon_add(mng.win); - elm_icon_standard_set(ic, "color"); + elm_icon_standard_set(ic, "image2"); +#else + IMAGE_ADD_NEW(mng.win, ic, "icon", "logo"); +#endif mw_icon_set(mng.win, ic); mng.layout = elm_layout_add(ap.win); elm_layout_theme_set(mng.layout, "layout", "manager", "internal"); diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c index a29a4b0..ba2e123 100644 --- a/src/bin/ui/image_manager.c +++ b/src/bin/ui/image_manager.c @@ -508,8 +508,12 @@ image_manager_add(void) mw_title_set(mng.win, _("Image manager")); evas_object_smart_callback_add(mng.win, "cancel", _mw_cancel_cb, NULL); evas_object_smart_callback_add(mng.win, "done", _mw_done_cb, NULL); +#if !HAVE_TIZEN ic = elm_icon_add(mng.win); elm_icon_standard_set(ic, "image2"); +#else + IMAGE_ADD_NEW(mng.win, ic, "icon", "logo"); +#endif mw_icon_set(mng.win, ic); if (mng.layout) goto done; diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c index 0ead0b2..ae0fb3b 100644 --- a/src/bin/ui/sound_manager.c +++ b/src/bin/ui/sound_manager.c @@ -547,8 +547,12 @@ sound_manager_add(void) mw_title_set(mng.win, _("Sound manager")); evas_object_smart_callback_add(mng.win, "cancel", _mw_cancel_cb, NULL); evas_object_smart_callback_add(mng.win, "done", _mw_done_cb, NULL); +#if !HAVE_TIZEN ic = elm_icon_add(mng.win); - elm_icon_standard_set(ic, "sound2"); + elm_icon_standard_set(ic, "image2"); +#else + IMAGE_ADD_NEW(mng.win, ic, "icon", "logo"); +#endif mw_icon_set(mng.win, ic); if (mng.layout) goto done; diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c index 35e0cb4..f594ccc 100644 --- a/src/bin/ui/style_manager.c +++ b/src/bin/ui/style_manager.c @@ -795,7 +795,12 @@ style_manager_add() mw_title_set(mng.win, _("Textblock style manager")); evas_object_smart_callback_add(mng.win, "cancel", _mw_cancel_cb, NULL); evas_object_smart_callback_add(mng.win, "done", _mw_done_cb, NULL); +#if !HAVE_TIZEN ic = elm_icon_add(mng.win); + elm_icon_standard_set(ic, "image2"); +#else + IMAGE_ADD_NEW(mng.win, ic, "icon", "logo"); +#endif elm_icon_standard_set(ic, "text2"); mw_icon_set(mng.win, ic); --
