From e0c0f8005d1d0d09a38b3d69ff458b80e3d5da7e Mon Sep 17 00:00:00 2001 From: Kairong Yin Date: Mon, 15 Apr 2013 20:36:46 +0800 Subject: [PATCH] Fix N_SE-27968 Change-Id: Ib8c9c3fced754a4b0bde1a416a427443714bb888 --- setting-about/src/setting-about-main.c | 8 ++++++-- setting-phone/src/setting-phone-region-format.c | 8 ++++++-- src/setting-main.c | 27 +++++++++++++++++-------- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c index 01a17b1..a2e5980 100755 --- a/setting-about/src/setting-about-main.c +++ b/setting-about/src/setting-about-main.c @@ -1165,13 +1165,15 @@ static void _input_panel_event_cb(void *data, Ecore_IMF_Context *ctx, int value) SETTING_TRACE("value == ECORE_IMF_INPUT_PANEL_STATE_SHOW"); if(ad->navi_item && !elm_object_item_part_content_get(ad->navi_item, "title_right_btn")) { + //Apply new SIP concept + /* Evas_Object *r_button = setting_create_button(ad->navi_bar, dgettext("sys_string", "IDS_COM_BODY_BACK"), NAVI_BACK_BUTTON_STYLE, __top_back_cb, ad); - elm_object_item_part_content_set(ad->navi_item, "title_right_btn", r_button); + elm_object_item_part_content_set(ad->navi_item, "title_right_btn", r_button);*/ /* if (ad->empty_flag) { @@ -1184,11 +1186,13 @@ static void _input_panel_event_cb(void *data, Ecore_IMF_Context *ctx, int value) else if(value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) { SETTING_TRACE("value == ECORE_IMF_INPUT_PANEL_STATE_HIDE"); + //Apply new SIP concept + /* if(ad->navi_item && elm_object_item_part_content_get(ad->navi_item, "title_right_btn")) { Evas_Object *btn = elm_object_item_part_content_unset(ad->navi_item, "title_right_btn"); evas_object_del(btn); - } + }*/ if (ad->item_dev_name) { elm_object_focus_set(ad->item_dev_name->eo_check, EINA_FALSE); diff --git a/setting-phone/src/setting-phone-region-format.c b/setting-phone/src/setting-phone-region-format.c index c0b45e7..e6f49ee 100755 --- a/setting-phone/src/setting-phone-region-format.c +++ b/setting-phone/src/setting-phone-region-format.c @@ -417,6 +417,8 @@ static int setting_phone_region_format_create(void *cb) setting_phone_region_format_click_softkey_cancel_cb, NULL, NULL, ad, sub_layout, ad->navi_bar, NULL); + //Apply new SIP concept + evas_object_data_set(ad->navi_bar, "sip.naviframe.title_obj", "SEARCH"); ad->gl_region = elm_genlist_add(ad->navi_bar); elm_object_style_set(ad->gl_region, "dialogue"); @@ -453,6 +455,8 @@ static int setting_phone_region_format_destroy(void *cb) /* error check */ retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER); SettingPhoneUG *ad = (SettingPhoneUG *) cb; + //Apply new SIP concept + evas_object_data_set(ad->navi_bar, "sip.naviframe.title_obj", NULL); /* FIXED : destroy only if it was created. */ if (setting_view_phone_region_format.is_create) { @@ -535,10 +539,10 @@ setting_phone_region_format_mouse_up_Gendial_list_radio_cb(void *data, int ret = setting_phone_region_format_set_dateformat(ad->region_keyStr[ad->prev_region], ad); setting_retm_if(ret == SETTING_RETURN_FAIL, "[Error] set date format fail"); - + ret = vconf_set_str(VCONFKEY_REGIONFORMAT,region); setting_retm_if(ret != 0, "[Error] set value of VCONFKEY_REGIONFORMAT fail"); - + /* after changed, go back to the previous page*/ setting_view_change(&setting_view_phone_region_format , &setting_view_phone_language_region, ad); diff --git a/src/setting-main.c b/src/setting-main.c index 0dc9869..00b4f53 100755 --- a/src/setting-main.c +++ b/src/setting-main.c @@ -1475,12 +1475,17 @@ static void __setting_show_title_toolbar(void *data, Evas_Object *obj, void *eve const char *support = evas_object_data_get(navi_bar, "sip.naviframe.title_obj"); SETTING_TRACE("support:%s", support); - if (support) + Elm_Object_Item *top_item = elm_naviframe_top_item_get(navi_bar); + if (0 == safeStrCmp("SEARCH", support)) { - Elm_Object_Item *top_item = elm_naviframe_top_item_get(navi_bar); - if (top_item) - elm_object_item_signal_emit(top_item, "elm,state,sip,shown", ""); + /* if (top_item) + elm_object_item_signal_emit(top_item, "elm,state,toolbar,instant_open", ""); */ + } else if (support) + { + if (top_item) + elm_object_item_signal_emit(top_item, "elm,state,sip,shown", ""); } + } static void __setting_hide_title_toolbar(void *data, Evas_Object *obj, void *event_info) @@ -1502,12 +1507,18 @@ static void __setting_hide_title_toolbar(void *data, Evas_Object *obj, void *eve const char *support = evas_object_data_get(navi_bar, "sip.naviframe.title_obj"); SETTING_TRACE("support:%s", support); - if (support) + Elm_Object_Item *top_item = elm_naviframe_top_item_get(navi_bar); + if (0 == safeStrCmp("SEARCH", support)) { - Elm_Object_Item *top_item = elm_naviframe_top_item_get(navi_bar); - if (top_item) - elm_object_item_signal_emit(top_item, "elm,state,sip,hidden", ""); + /* if (top_item) + elm_object_item_signal_emit(top_item, "elm,state,toolbar,instant_close", ""); */ } + else if (support) + { + if (top_item) + elm_object_item_signal_emit(top_item, "elm,state,sip,hidden", ""); + } + } static bool __setting_create_main_view(void *data) -- 2.7.4