From: Jihoon Kim Date: Mon, 23 Oct 2017 05:20:35 +0000 (+0900) Subject: Support ime_manager_show_ime_list() in wearable/TV profile X-Git-Tag: submit/tizen/20171107.071132~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65a7c6a4c58f6167ee44acbfa91b5559d815a117;p=platform%2Fcore%2Fuifw%2Finputmethod-setting.git Support ime_manager_show_ime_list() in wearable/TV profile Change-Id: I322b38e71a3b03a7aa0374303f83ecf0e6169e51 Signed-off-by: Jihoon Kim --- diff --git a/im_setting_list/input_method_setting_list_ui.cpp b/im_setting_list/input_method_setting_list_ui.cpp index 31776d3..912bb82 100644 --- a/im_setting_list/input_method_setting_list_ui.cpp +++ b/im_setting_list/input_method_setting_list_ui.cpp @@ -321,7 +321,6 @@ static void im_setting_list_check_button_change_cb(void *data, Evas_Object *obj, } } -#ifdef _MOBILE static void im_setting_list_popup_ok_cb(void *data, Evas_Object *obj, void *event_info) { @@ -397,7 +396,6 @@ static void im_setting_list_item_sel_cb(void *data, Evas_Object *obj, void *even im_setting_list_show_popup(data, obj, im_setting_list_popup_ok_cb, im_setting_list_popup_cancel_cb); } } -#endif static void im_setting_list_set_default_keyboard_item_sel_cb(void *data, Evas_Object *obj, void *event_info) { @@ -537,11 +535,15 @@ static Evas_Object *im_setting_list_genlist_keyboard_list_item_icon_get(void *da return NULL; } - if (!strcmp(part, "elm.swallow.end")) { + if (!strcmp(part, "elm.swallow.end") || + !strcmp(part, "elm.icon")) { Evas_Object *ck = elm_check_add(obj); elm_object_style_set(ck, "on&off"); - elm_object_disabled_set(ck, g_ime_info_list[index].is_preinstalled || (index == g_active_ime_index)); elm_check_state_set(ck, g_gen_item_data[index].chk_status); + elm_object_disabled_set(ck, g_ime_info_list[index].is_preinstalled || (index == g_active_ime_index)); +#ifndef _MOBILE + elm_object_disabled_set(ck, EINA_TRUE); +#endif evas_object_propagate_events_set(ck, EINA_FALSE); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -736,53 +738,59 @@ static void im_setting_list_add_ime(void *data) { ad); elm_object_item_disabled_set(item, !(g_ime_info_list[g_active_ime_index].has_option)); - } #ifdef _MOBILE - /* Keyboards group */ - Elm_Object_Item *group_header_item = NULL; - Item_Data *id = NULL; - group_header_item = elm_genlist_item_append(ad->genlist, - itc_im_list_group, - IM_SETTING_LIST_KEYBOARD_HEADER, - NULL, - ELM_GENLIST_ITEM_GROUP, - NULL, - NULL); - elm_genlist_item_select_mode_set(group_header_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - - /* keyboard list */ - int info_list_size = g_ime_info_list.size(); - for (int i = 0; i < info_list_size; i++) { - gen_item_data item_data; - - if (g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)) { - item_data.chk_status = EINA_TRUE; - } else { - item_data.chk_status = g_ime_info_list[i].is_enabled; - } - g_gen_item_data.push_back(item_data); + /* Keyboards group */ + Elm_Object_Item *group_header_item = NULL; + group_header_item = elm_genlist_item_append(ad->genlist, + itc_im_list_group, + IM_SETTING_LIST_KEYBOARD_HEADER, + NULL, + ELM_GENLIST_ITEM_GROUP, + NULL, + NULL); + elm_genlist_item_select_mode_set(group_header_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); +#endif + } - id = (Item_Data *)calloc(sizeof(Item_Data), 1); - if (id) { - id->index = i; +#ifndef _MOBILE + if (ad->app_type == APP_TYPE_NORMAL) +#endif + { + Item_Data *id = NULL; - id->item = elm_genlist_item_append(ad->genlist, - itc_im_list_keyboard_list, - id, - NULL, - ELM_GENLIST_ITEM_NONE, - im_setting_list_item_sel_cb, - (void *)(i)); + /* keyboard list */ + int info_list_size = g_ime_info_list.size(); + for (int i = 0; i < info_list_size; i++) { + gen_item_data item_data; if (g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)) { - elm_object_item_disabled_set(id->item, EINA_TRUE); + item_data.chk_status = EINA_TRUE; + } else { + item_data.chk_status = g_ime_info_list[i].is_enabled; } + g_gen_item_data.push_back(item_data); + + id = (Item_Data *)calloc(sizeof(Item_Data), 1); + if (id) { + id->index = i; + + id->item = elm_genlist_item_append(ad->genlist, + itc_im_list_keyboard_list, + id, + NULL, + ELM_GENLIST_ITEM_NONE, + im_setting_list_item_sel_cb, + (void *)(i)); - g_gen_item_data[i].gen_item = id->item; + if (g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)) { + elm_object_item_disabled_set(id->item, EINA_TRUE); + } + + g_gen_item_data[i].gen_item = id->item; + } } } -#endif #ifdef _CIRCLE im_setting_list_add_padding(ad->genlist);