From 8010e245cea5bd3bd792e938deb0649ac27e63f0 Mon Sep 17 00:00:00 2001 From: Sunyeop Hwang Date: Wed, 9 Jan 2013 11:11:07 +0900 Subject: [PATCH] remove radio button in lang®ion list Change-Id: I33cd6628d9604c6bbd296d29b46b874c686e91dc --- setting-phone/src/setting-phone-display-language.c | 27 +++++++------ setting-phone/src/setting-phone-region-format.c | 45 ++++++++++------------ 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/setting-phone/src/setting-phone-display-language.c b/setting-phone/src/setting-phone-display-language.c index d873f9a..8a61cc1 100755 --- a/setting-phone/src/setting-phone-display-language.c +++ b/setting-phone/src/setting-phone-display-language.c @@ -159,13 +159,13 @@ static int setting_phone_display_language_create(void *cb) // [UI] Automatic Setting_GenGroupItem_Data *item_data = NULL; item_data = - setting_create_Gendial_field_1radio(scroller, - &(ad->itc_1text_1icon_2), + setting_create_Gendial_field_def(scroller, + &(ad->itc_1text), gl_sel_cb, ad->chk_lang, - SWALLOW_Type_1RADIO, - ad->chk_lang, 0, - "IDS_COM_BODY_AUTOMATIC", NULL); + SWALLOW_Type_INVALID, NULL, NULL, + 0, + "IDS_COM_BODY_AUTOMATIC", NULL, NULL); if (item_data) { item_data->userdata = ad; } else { @@ -183,15 +183,14 @@ static int setting_phone_display_language_create(void *cb) EINA_LIST_FOREACH( langlist, elist, pnode) { item_data = - setting_create_Gendial_field_1radio(scroller, - &(ad->itc_1text_1icon_2), + setting_create_Gendial_field_def(scroller, + &(ad->itc_1text), gl_sel_cb, ad->chk_lang, - SWALLOW_Type_1RADIO, - ad->chk_lang, + SWALLOW_Type_INVALID, NULL, NULL, //idx, // <<< WARNING pnode->number, - pnode->title, NULL); + pnode->title, NULL, NULL); if (item_data) { item_data->userdata = ad; } else { @@ -292,10 +291,10 @@ setting_phone_display_language_mouse_up_Gendial_list_radio_cb(void *data, //SETTING_TRACE("chk_status = %d ", list_item->chk_status); //SETTING_TRACE("---------------------------------------------"); /* if not change, return */ - if (ad->prev_lang == list_item->chk_status) { - SETTING_TRACE("NOT CHANGED "); - return; - } + //if (ad->prev_lang == list_item->chk_status) { + // SETTING_TRACE("NOT CHANGED "); + // return; + //} elm_radio_value_set(radio, list_item->chk_status); setting_phone_display_language_close_popup_ex(ad); diff --git a/setting-phone/src/setting-phone-region-format.c b/setting-phone/src/setting-phone-region-format.c index 77627c8..53a3995 100755 --- a/setting-phone/src/setting-phone-region-format.c +++ b/setting-phone/src/setting-phone-region-format.c @@ -201,10 +201,10 @@ static Eina_Bool __region_animator_cb(void *data) ad->pop_progress = NULL; } - if (ad->selected_item) { + //if (ad->selected_item) { //show the last item - elm_genlist_item_show(ad->selected_item, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE); - } + // elm_genlist_item_show(ad->selected_item, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE); + //} ad->prev_region = ad->selected_region_idx; Elm_Object_Item *item = NULL; @@ -217,14 +217,13 @@ static Eina_Bool __region_animator_cb(void *data) int i = ad->gl_region_cur_index++; if (isEmptyStr(ad->search_text) || is_substr_ncase(ad->region_desc[i], ad->search_text)) { item_data = - setting_create_Gendial_field_1radio(ad->gl_region, - &(ad->itc_1text_1icon_2), + setting_create_Gendial_field_def(ad->gl_region, + &(ad->itc_1text), setting_phone_region_format_mouse_up_Gendial_list_radio_cb, ad->chk_region, - SWALLOW_Type_1RADIO, - ad->chk_region, + SWALLOW_Type_INVALID, NULL, NULL, ad->region_index[i], - ad->region_desc[i]/* HERE */, NULL); + ad->region_desc[i]/* HERE */, NULL, NULL); if (item_data) { item_data->userdata = ad; @@ -280,14 +279,13 @@ static void __region_genlist_create(void *data) if (isEmptyStr(ad->search_text) || is_substr_ncase(ad->region_desc[i], ad->search_text)) { item_data = - setting_create_Gendial_field_1radio(ad->gl_region, - &(ad->itc_1text_1icon_2), + setting_create_Gendial_field_def(ad->gl_region, + &(ad->itc_1text), setting_phone_region_format_mouse_up_Gendial_list_radio_cb, ad->chk_region, - SWALLOW_Type_1RADIO, - ad->chk_region, + SWALLOW_Type_INVALID, NULL, NULL, ad->region_index[i], - ad->region_desc[i], NULL); + ad->region_desc[i], NULL, NULL); if (item_data) { item_data->userdata = ad; } else { @@ -322,10 +320,10 @@ static void __region_genlist_create(void *data) } else {//had finished adding items SETTING_TRACE("had finished adding items"); - if(ad->selected_item) { + //if(ad->selected_item) { //show the selected_item item - elm_genlist_item_show(ad->selected_item, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE); - } + // elm_genlist_item_show(ad->selected_item, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE); + //} if (ad->pop_progress) { SETTING_TRACE("To delete ad->pop_progress"); evas_object_del(ad->pop_progress); @@ -353,14 +351,13 @@ static Eina_Bool __region_genlist_update(void *data) if (isEmptyStr(ad->search_text) || is_substr_ncase(ad->region_desc[i], ad->search_text)) { item_data = - setting_create_Gendial_field_1radio(ad->gl_region, - &(ad->itc_1text_1icon_2), + setting_create_Gendial_field_def(ad->gl_region, + &(ad->itc_1text), setting_phone_region_format_mouse_up_Gendial_list_radio_cb, ad->chk_region, - SWALLOW_Type_1RADIO, - ad->chk_region, + SWALLOW_Type_INVALID, NULL, NULL, ad->region_index[i], - ad->region_desc[i], NULL); + ad->region_desc[i], NULL, NULL); if (item_data) { item_data->userdata = ad; } else { @@ -529,9 +526,9 @@ setting_phone_region_format_mouse_up_Gendial_list_radio_cb(void *data, SETTING_TRACE("region_keyStr = %s", ad->region_keyStr[list_item->chk_status]); /* if not change, return */ - if (ad->prev_region == list_item->chk_status) { - return; - } + //if (ad->prev_region == list_item->chk_status) { + // return; + //} elm_radio_value_set(radio, list_item->chk_status); ad->prev_region = list_item->chk_status; -- 2.7.4