Apply new UX for editfield widget (tizen_2.1)
authorsunil85.kim <sunil85.kim@samsung.com>
Tue, 26 Mar 2013 02:24:44 +0000 (11:24 +0900)
committersunil85.kim <sunil85.kim@samsung.com>
Tue, 26 Mar 2013 02:24:44 +0000 (11:24 +0900)
debian/changelog
packaging/wifi-efl-ug.spec
sources/libraries/Common/common_eap_connect.c
sources/libraries/Common/common_ip_info.c
sources/libraries/Common/common_utils.c
sources/libraries/Common/include/common_utils.h

index 8b33e90..5e1539c 100644 (file)
@@ -1,3 +1,11 @@
+wifi-efl-ug (0.5.2-5) precise; urgency=low
+
+  * Apply new UX for editfield widget
+  * Git: magnolia/apps/home/ug-wifi-efl
+  * Tag: wifi-efl-ug_0.5.2-5
+
+ -- sunil85.kim <isurit@sunil85.kim>  Mon, 25 Mar 2013 15:10:05 +0900
+
 wifi-efl-ug (0.5.2-4) precise; urgency=low
 
   * Fix the keypad layout in EAP connect screen
index ef1ad68..1558361 100644 (file)
@@ -1,6 +1,6 @@
 Name:       wifi-efl-ug
 Summary:    Wi-Fi UI Gadget
-Version:    0.5.2_4
+Version:    0.5.2_5
 Release:    1
 Group:      App/Network
 License:    Flora License
index c52cfc5..c12f4ef 100644 (file)
@@ -390,148 +390,174 @@ static char *_gl_eap_user_cert_text_get(void *data, Evas_Object *obj, const char
 
 static void _gl_eap_entry_cursor_changed_cb(void* data, Evas_Object* obj, void* event_info)
 {
-       if (data == NULL)
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
                return;
 
-       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (elm_object_focus_get(obj)) {
+               if (elm_entry_is_empty(obj))
+                       elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,hide", "");
+               else
+                       elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,show", "");
+       }
 
-       if (entry_info) {
+       if (entry_info->entry_txt) {
                g_free(entry_info->entry_txt);
                entry_info->entry_txt = NULL;
-               char *entry_text = elm_entry_markup_to_utf8(elm_entry_entry_get(obj));
+       }
 
-               if (entry_text != NULL && entry_text[0] != '\0')
-                       entry_info->entry_txt = g_strdup(elm_entry_entry_get(obj));
+       char *entry_text = elm_entry_markup_to_utf8(elm_entry_entry_get(obj));
 
-               g_free(entry_text);
-       }
+       if (entry_text != NULL && entry_text[0] != '\0')
+               entry_info->entry_txt = g_strdup(elm_entry_entry_get(obj));
+
+       g_free(entry_text);
 }
 
 static void _gl_eap_entry_changed_cb(void* data, Evas_Object* obj, void* event_info)
 {
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
+               return;
+
        if (obj == NULL)
                return;
 
-       if (elm_object_focus_get(data)) {
+       if (elm_object_focus_get(obj)) {
                if (elm_entry_is_empty(obj))
-                       elm_object_signal_emit(data, "elm,state,eraser,hide", "elm");
+                       elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,hide", "");
                else
-                       elm_object_signal_emit(data, "elm,state,eraser,show", "elm");
+                       elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,show", "");
        }
 }
 
 static void _gl_eap_entry_focused_cb(void *data, Evas_Object *obj, void *event_info)
 {
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
+               return;
+
        if (!elm_entry_is_empty(obj))
-               elm_object_signal_emit(data, "elm,state,eraser,show", "elm");
-       elm_object_signal_emit(data, "elm,state,guidetext,hide", "elm");
+               elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,show", "");
+
+       elm_object_item_signal_emit(entry_info->item, "elm,state,rename,hide", "");
 }
 
 static void _gl_eap_entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       INFO_LOG(UG_NAME_NORMAL, "_gl_eap_entry_unfocused_cb entered");
-
-       if (elm_entry_is_empty(obj))
-               elm_object_signal_emit(data, "elm,state,guidetext,show", "elm");
-       else {
-               elm_object_signal_emit(data, "elm,state,guidetext,hide", "elm");
-       }
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
+               return;
 
-       elm_object_signal_emit(data, "elm,state,eraser,hide", "elm");
+       elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,hide", "");
+       elm_object_item_signal_emit(entry_info->item, "elm,state,rename,show", "");
 }
 
 static void _gl_eap_entry_eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-       elm_entry_entry_set(data, "");
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
+               return;
+
+       Evas_Object *entry = elm_object_item_part_content_get(entry_info->item, "elm.icon.entry");
+       elm_object_focus_set(entry, EINA_TRUE);
+       elm_entry_entry_set(entry, "");
 }
 
-static Evas_Object *_gl_eap_entry_item_content_get(void *data, Evas_Object *obj, const char *part)
+static char *_gl_eap_entry_item_text_get(void *data, Evas_Object *obj, const char *part)
 {
-       if (g_strcmp0(part, "elm.icon")) {
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
                return NULL;
-       }
 
+       if (!strcmp(part, "elm.text"))
+               return g_strdup(entry_info->title_txt);
+
+       return NULL;
+}
+
+static Evas_Object *_gl_eap_entry_item_content_get(void *data, Evas_Object *obj, const char *part)
+{
        common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
        if (!entry_info)
                return NULL;
 
-       Evas_Object *layout = NULL;
-       Evas_Object *entry = NULL;
-       char *title = NULL;
-       char *guide_txt = NULL;
-       char *accepted = NULL;
-       Eina_Bool hide_entry_txt = EINA_FALSE;
-       Elm_Input_Panel_Layout panel_type = ELM_INPUT_PANEL_LAYOUT_PASSWORD;
-
-       Elm_Entry_Filter_Limit_Size limit_filter_data;
-
-       layout = elm_layout_add(obj);
-       elm_layout_theme_set(layout, "layout", "editfield", "title");
-
-       entry = elm_entry_add(layout);
-       elm_entry_scrollable_set(entry, EINA_TRUE);
-       elm_entry_single_line_set(entry, EINA_TRUE);
-       elm_object_part_content_set(layout, "elm.swallow.content", entry);
-
-       switch (entry_info->entry_id)
-       {
-       case ENTRY_TYPE_USER_ID:
-               title = entry_info->title_txt;
-               guide_txt = entry_info->guide_txt;
-               break;
-       case ENTRY_TYPE_ANONYMOUS_ID:
-               title = entry_info->title_txt;
-               guide_txt = entry_info->guide_txt;
-               break;
-       case ENTRY_TYPE_PASSWORD:
-               title = entry_info->title_txt;
-               guide_txt = entry_info->guide_txt;
-               hide_entry_txt = EINA_TRUE;
-               break;
-       default:
-               return NULL;
-       }
-       elm_object_part_text_set(layout, "elm.text", title);
-       elm_object_part_text_set(layout, "elm.guidetext", guide_txt);
-       elm_entry_password_set(entry, hide_entry_txt);
-       if (entry_info->entry_txt && (strlen(entry_info->entry_txt) > 0)) {
-               elm_entry_entry_set(entry, entry_info->entry_txt);
-               elm_object_signal_emit(layout, "elm,state,guidetext,hide", "elm");
-       }
-       elm_entry_input_panel_layout_set(entry, panel_type);
-       limit_filter_data.max_char_count = 32;
-       elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, &limit_filter_data);
-
-       Elm_Entry_Filter_Accept_Set digits_filter_data;
-       memset(&digits_filter_data, 0, sizeof(Elm_Entry_Filter_Accept_Set));
-       digits_filter_data.accepted = accepted;
-       elm_entry_markup_filter_append(entry, elm_entry_filter_accept_set, &digits_filter_data);
-       elm_entry_context_menu_disabled_set(entry, EINA_TRUE);
-
-       Ecore_IMF_Context *imf_ctxt = elm_entry_imf_context_get(entry);
-       if (imf_ctxt && entry_info->input_panel_cb) {
-               ecore_imf_context_input_panel_event_callback_add(imf_ctxt,
-                               ECORE_IMF_INPUT_PANEL_STATE_EVENT,
-                               entry_info->input_panel_cb,
-                               entry_info->input_panel_cb_data);
-               DEBUG_LOG(UG_NAME_NORMAL, "set the imf ctxt cbs");
-       }
+       if (g_strcmp0(part, "elm.icon.entry") == 0) {
+               Evas_Object *entry = NULL;
+               char *guide_txt = NULL;
+               char *accepted = NULL;
+               Eina_Bool hide_entry_txt = EINA_FALSE;
+               Elm_Input_Panel_Layout panel_type = ELM_INPUT_PANEL_LAYOUT_PASSWORD;
+
+               Elm_Entry_Filter_Limit_Size limit_filter_data;
+
+               switch (entry_info->entry_id)
+               {
+               case ENTRY_TYPE_USER_ID:
+                       guide_txt = entry_info->guide_txt;
+                       break;
+               case ENTRY_TYPE_ANONYMOUS_ID:
+                       guide_txt = entry_info->guide_txt;
+                       break;
+               case ENTRY_TYPE_PASSWORD:
+                       guide_txt = entry_info->guide_txt;
+                       hide_entry_txt = EINA_TRUE;
+                       break;
+               default:
+                       return NULL;
+               }
+
+               entry = elm_entry_add(obj);
+               elm_entry_scrollable_set(entry, EINA_TRUE);
+               elm_entry_single_line_set(entry, EINA_TRUE);
+               elm_entry_password_set(entry, hide_entry_txt);
+
+               elm_object_part_text_set(entry, "elm.guide", guide_txt);
+               if (entry_info->entry_txt && (strlen(entry_info->entry_txt) > 0)) {
+                       elm_entry_entry_set(entry, entry_info->entry_txt);
+               }
 
-       evas_object_smart_callback_add(entry, "cursor,changed", _gl_eap_entry_cursor_changed_cb, entry_info);
-       evas_object_smart_callback_add(entry, "changed", _gl_eap_entry_changed_cb, layout);
-       evas_object_smart_callback_add(entry, "focused", _gl_eap_entry_focused_cb, layout);
-       evas_object_smart_callback_add(entry, "unfocused", _gl_eap_entry_unfocused_cb, layout);
-       elm_object_signal_callback_add(layout, "elm,eraser,clicked", "elm", _gl_eap_entry_eraser_clicked_cb, entry);
-       evas_object_show(entry);
-
-       if (ENTRY_TYPE_USER_ID == entry_info->entry_id) {
-               if (TRUE == g_eap_id_show_keypad) {
-                       elm_object_focus_set(entry, EINA_TRUE);
-                       g_eap_id_show_keypad = FALSE;
+               elm_entry_input_panel_layout_set(entry, panel_type);
+
+               limit_filter_data.max_char_count = 32;
+               elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, &limit_filter_data);
+
+               Elm_Entry_Filter_Accept_Set digits_filter_data;
+               memset(&digits_filter_data, 0, sizeof(Elm_Entry_Filter_Accept_Set));
+               digits_filter_data.accepted = accepted;
+               elm_entry_markup_filter_append(entry, elm_entry_filter_accept_set, &digits_filter_data);
+               elm_entry_context_menu_disabled_set(entry, EINA_TRUE);
+
+               Ecore_IMF_Context *imf_ctxt = elm_entry_imf_context_get(entry);
+               if (imf_ctxt && entry_info->input_panel_cb) {
+                       ecore_imf_context_input_panel_event_callback_add(imf_ctxt,
+                                       ECORE_IMF_INPUT_PANEL_STATE_EVENT,
+                                       entry_info->input_panel_cb,
+                                       entry_info->input_panel_cb_data);
+                       DEBUG_LOG(UG_NAME_NORMAL, "set the imf ctxt cbs");
                }
+
+               evas_object_smart_callback_add(entry, "cursor,changed", _gl_eap_entry_cursor_changed_cb, entry_info);
+               evas_object_smart_callback_add(entry, "changed", _gl_eap_entry_changed_cb, entry_info);
+               evas_object_smart_callback_add(entry, "focused", _gl_eap_entry_focused_cb, entry_info);
+               evas_object_smart_callback_add(entry, "unfocused", _gl_eap_entry_unfocused_cb, entry_info);
+
+               if (ENTRY_TYPE_USER_ID == entry_info->entry_id) {
+                       if (TRUE == g_eap_id_show_keypad) {
+                               elm_object_focus_set(entry, EINA_TRUE);
+                               g_eap_id_show_keypad = FALSE;
+                       }
+               }
+
+               return entry;
+       } else if (g_strcmp0(part, "elm.icon.eraser") == 0) {
+               Evas_Object *btn = elm_button_add(obj);
+               elm_object_style_set(btn, "editfield_clear");
+               evas_object_smart_callback_add(btn, "clicked", _gl_eap_entry_eraser_clicked_cb, entry_info);
+               return btn;
        }
-       entry_info->layout = layout;
-       return layout;
+
+       return NULL;
 }
 
 static void _gl_eap_entry_item_del(void *data, Evas_Object *obj)
@@ -544,7 +570,7 @@ static void _gl_eap_entry_item_del(void *data, Evas_Object *obj)
                g_free(entry_info->entry_txt);
 
        if (entry_info->input_panel_cb) {
-               Evas_Object *entry = common_utils_entry_layout_get_entry(entry_info->layout);
+               Evas_Object *entry = elm_object_item_part_content_get(entry_info->item, "elm.icon.entry");
                Ecore_IMF_Context *imf_ctxt = elm_entry_imf_context_get(entry);
                if (imf_ctxt) {
                        ecore_imf_context_input_panel_event_callback_del(imf_ctxt, ECORE_IMF_INPUT_PANEL_STATE_EVENT, entry_info->input_panel_cb);
@@ -679,8 +705,8 @@ static void __common_eap_connect_popup_init_item_class(void *data)
        g_eap_user_cert_itc.func.state_get = NULL;
        g_eap_user_cert_itc.func.del = NULL;
 
-       g_eap_entry_itc.item_style = "dialogue/1icon";
-       g_eap_entry_itc.func.text_get = NULL;
+       g_eap_entry_itc.item_style = "dialogue/editfield/title";
+       g_eap_entry_itc.func.text_get = _gl_eap_entry_item_text_get;
        g_eap_entry_itc.func.content_get = _gl_eap_entry_item_content_get;
        g_eap_entry_itc.func.state_get = NULL;
        g_eap_entry_itc.func.del = _gl_eap_entry_item_del;
@@ -827,8 +853,9 @@ static void _create_and_update_list_items_based_on_rules(eap_type_t new_type, ea
                edit_box_details->entry_id = ENTRY_TYPE_USER_ID;
                edit_box_details->title_txt = sc(eap_data->str_pkg_name, I18N_TYPE_Identity);
                edit_box_details->guide_txt = sc(eap_data->str_pkg_name, I18N_TYPE_Enter_Identity);
-               eap_data->eap_id_item = elm_genlist_item_insert_after(view_list, &g_eap_entry_itc, edit_box_details, NULL, eap_data->eap_user_cert_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
-               elm_genlist_item_select_mode_set(eap_data->eap_id_item, ELM_OBJECT_SELECT_MODE_NONE);
+               edit_box_details->item = elm_genlist_item_insert_after(view_list, &g_eap_entry_itc, edit_box_details, NULL, eap_data->eap_user_cert_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+               elm_genlist_item_select_mode_set(edit_box_details->item, ELM_OBJECT_SELECT_MODE_NONE);
+               eap_data->eap_id_item = edit_box_details->item;
                g_eap_id_show_keypad = FALSE;
 
                /* Add EAP Anonymous Identity */
@@ -836,16 +863,18 @@ static void _create_and_update_list_items_based_on_rules(eap_type_t new_type, ea
                edit_box_details->entry_id = ENTRY_TYPE_ANONYMOUS_ID;
                edit_box_details->title_txt = sc(eap_data->str_pkg_name, I18N_TYPE_Anonymous_Identity);
                edit_box_details->guide_txt = sc(eap_data->str_pkg_name, I18N_TYPE_Enter_Anonymous_Identity);
-               eap_data->eap_anonyid_item = elm_genlist_item_insert_after(view_list, &g_eap_entry_itc, edit_box_details, NULL, eap_data->eap_id_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
-               elm_genlist_item_select_mode_set(eap_data->eap_anonyid_item, ELM_OBJECT_SELECT_MODE_NONE);
+               edit_box_details->item = elm_genlist_item_insert_after(view_list, &g_eap_entry_itc, edit_box_details, NULL, eap_data->eap_id_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+               elm_genlist_item_select_mode_set(edit_box_details->item, ELM_OBJECT_SELECT_MODE_NONE);
+               eap_data->eap_anonyid_item = edit_box_details->item;
 
                /* Add EAP Password */
                edit_box_details = g_new0(common_utils_entry_info_t, 1);
                edit_box_details->entry_id = ENTRY_TYPE_PASSWORD;
                edit_box_details->title_txt = sc(eap_data->str_pkg_name, I18N_TYPE_Password);
                edit_box_details->guide_txt = sc(eap_data->str_pkg_name, I18N_TYPE_Enter_password);
-               eap_data->eap_pw_item = elm_genlist_item_insert_after(view_list, &g_eap_entry_itc, edit_box_details, NULL, eap_data->eap_anonyid_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
-               elm_genlist_item_select_mode_set(eap_data->eap_pw_item, ELM_OBJECT_SELECT_MODE_NONE);
+               edit_box_details->item = elm_genlist_item_insert_after(view_list, &g_eap_entry_itc, edit_box_details, NULL, eap_data->eap_anonyid_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+               elm_genlist_item_select_mode_set(edit_box_details->item, ELM_OBJECT_SELECT_MODE_NONE);
+               eap_data->eap_pw_item = edit_box_details->item;
 
                if (eap_data->popup) {  /* Popup */
                        __common_eap_popup_set_imf_ctxt_evnt_cb(eap_data);
@@ -1050,10 +1079,8 @@ static Eina_Bool __common_eap_connect_show_ime(void *data)
        if (!list_entry_item)
                return ECORE_CALLBACK_CANCEL;
 
-       common_utils_entry_info_t *entry_info = elm_object_item_data_get(list_entry_item);
-       Evas_Object *lyt = entry_info->layout;
-       Evas_Object *entry = common_utils_entry_layout_get_entry(lyt);
-       if (!lyt || !entry)
+       Evas_Object *entry = elm_object_item_part_content_get(list_entry_item, "elm.icon.entry");
+       if (!entry)
                return ECORE_CALLBACK_CANCEL;
 
        g_eap_id_show_keypad = TRUE;
@@ -1498,8 +1525,9 @@ eap_info_list_t *eap_info_append_items(wifi_ap_h ap, Evas_Object* view_list,
                edit_box_details->guide_txt = sc(str_pkg_name, I18N_TYPE_Unchanged);
                edit_box_details->input_panel_cb = input_panel_cb;
                edit_box_details->input_panel_cb_data = input_panel_cb_data;
-               eap_info_list_data->pswd_item = elm_genlist_item_append(view_list, &g_eap_entry_itc, edit_box_details, NULL, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+               edit_box_details->item = elm_genlist_item_append(view_list, &g_eap_entry_itc, edit_box_details, NULL, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
                elm_genlist_item_select_mode_set(eap_info_list_data->pswd_item, ELM_OBJECT_SELECT_MODE_NONE);
+               eap_info_list_data->pswd_item = edit_box_details->item;
        }
 
        __COMMON_FUNC_EXIT__;
index 47ad33d..3ba29f5 100644 (file)
@@ -99,27 +99,37 @@ static char *_ip_info_detail_description_text_get(void *data,
 
 static void _ip_info_entry_cursor_changed_cb(void* data, Evas_Object* obj, void* event_info)
 {
-       if (data == NULL)
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
                return;
 
-       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (elm_object_focus_get(obj)) {
+               if (elm_entry_is_empty(obj))
+                       elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,hide", "");
+               else
+                       elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,show", "");
+       }
 
-       if (entry_info) {
+       if (entry_info->entry_txt) {
                g_free(entry_info->entry_txt);
                entry_info->entry_txt = NULL;
+       }
 
-               char *entry_text = elm_entry_markup_to_utf8(elm_entry_entry_get(obj));
+       char *entry_text = elm_entry_markup_to_utf8(elm_entry_entry_get(obj));
 
-               if (entry_text != NULL && entry_text[0] != '\0')
-                       entry_info->entry_txt = g_strdup(elm_entry_entry_get(obj));
+       if (entry_text != NULL && entry_text[0] != '\0')
+               entry_info->entry_txt = g_strdup(elm_entry_entry_get(obj));
 
-               g_free(entry_text);
-       }
+       g_free(entry_text);
 }
 
 static void _ip_info_entry_changed_cb(void *data,
                Evas_Object *obj, void *event_info)
 {
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
+               return;
+
        int entry_pos = 0;
        char *entry_text = NULL;
        char **ip_text = NULL;
@@ -128,11 +138,11 @@ static void _ip_info_entry_changed_cb(void *data,
        if (obj == NULL)
                return;
 
-       if (elm_object_focus_get(data)) {
+       if (elm_object_focus_get(obj)) {
                if (elm_entry_is_empty(obj))
-                       elm_object_signal_emit(data, "elm,state,eraser,hide", "elm");
+                       elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,hide", "");
                else
-                       elm_object_signal_emit(data, "elm,state,eraser,show", "elm");
+                       elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,show", "");
        }
 
        panel_type = elm_entry_input_panel_layout_get(obj);
@@ -193,19 +203,23 @@ static void _ip_info_entry_changed_cb(void *data,
 
 static void _ip_info_entry_focused_cb(void *data, Evas_Object *obj, void *event_info)
 {
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
+               return;
+
        if (!elm_entry_is_empty(obj))
-               elm_object_signal_emit(data, "elm,state,eraser,show", "elm");
-       elm_object_signal_emit(data, "elm,state,guidetext,hide", "elm");
+               elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,show", "");
+
+       elm_object_item_signal_emit(entry_info->item, "elm,state,rename,hide", "");
 }
 
 static void _ip_info_entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       INFO_LOG(UG_NAME_NORMAL, "_ip_info_entry_unfocused_cb entered");
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
+               return;
 
-       if (elm_entry_is_empty(obj))
-               elm_object_signal_emit(data, "elm,state,guidetext,show", "elm");
-       else {
-               elm_object_signal_emit(data, "elm,state,guidetext,hide", "elm");
+       if (!elm_entry_is_empty(obj)) {
                int panel_type = elm_entry_input_panel_layout_get(obj);
                if (panel_type == ELM_INPUT_PANEL_LAYOUT_IP) {
                        int ip_addr[4] = {0};
@@ -217,121 +231,128 @@ static void _ip_info_entry_unfocused_cb(void *data, Evas_Object *obj, void *even
                }
        }
 
-       elm_object_signal_emit(data, "elm,state,eraser,hide", "elm");
+       elm_object_item_signal_emit(entry_info->item, "elm,state,eraser,hide", "");
+       elm_object_item_signal_emit(entry_info->item, "elm,state,rename,show", "");
 }
 
-static void _ip_info_entry_eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+static void _ip_info_entry_eraser_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       elm_entry_entry_set(data, "");
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
+               return;
+
+       Evas_Object *entry = elm_object_item_part_content_get(entry_info->item, "elm.icon.entry");
+       elm_object_focus_set(entry, EINA_TRUE);
+       elm_entry_entry_set(entry, "");
 }
 
-static Evas_Object *_ip_info_entry_item_content_get(void *data, Evas_Object *obj, const char *part)
+static char *_ip_info_entry_item_text_get(void *data, Evas_Object *obj, const char *part)
 {
-       if (g_strcmp0(part, "elm.icon")) {
+       common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
+       if (!entry_info)
                return NULL;
-       }
 
+       if (!strcmp(part, "elm.text"))
+               return g_strdup(entry_info->title_txt);
+
+       return NULL;
+}
+
+static Evas_Object *_ip_info_entry_item_content_get(void *data, Evas_Object *obj, const char *part)
+{
        common_utils_entry_info_t *entry_info = (common_utils_entry_info_t *)data;
        if (!entry_info)
                return NULL;
 
-       Evas_Object *layout = NULL;
-       Evas_Object *entry = NULL;
-       char *title = NULL;
-       char *guide_txt = NULL;
-       char *accepted = NULL;
-       Eina_Bool hide_entry_txt = EINA_FALSE;
-       Elm_Input_Panel_Layout panel_type;
-
-       Elm_Entry_Filter_Limit_Size limit_filter_data;
-
-       layout = elm_layout_add(obj);
-       elm_layout_theme_set(layout, "layout", "editfield", "title");
-
-       entry = elm_entry_add(layout);
-       elm_entry_scrollable_set(entry, EINA_TRUE);
-       elm_entry_single_line_set(entry, EINA_TRUE);
-       elm_object_part_content_set(layout, "elm.swallow.content", entry);
-
-       switch (entry_info->entry_id)
-       {
-       case ENTRY_TYPE_IP_ADDR:
-               title = entry_info->title_txt;
-               guide_txt = entry_info->guide_txt;
-               panel_type = ELM_INPUT_PANEL_LAYOUT_IP;
-               accepted = "0123456789.";
-               break;
-       case ENTRY_TYPE_SUBNET_MASK:
-               title = entry_info->title_txt;
-               guide_txt = entry_info->guide_txt;
-               panel_type = ELM_INPUT_PANEL_LAYOUT_IP;
-               accepted = "0123456789.";
-               break;
-       case ENTRY_TYPE_GATEWAY:
-               title = entry_info->title_txt;
-               guide_txt = entry_info->guide_txt;
-               panel_type = ELM_INPUT_PANEL_LAYOUT_IP;
-               accepted = "0123456789.";
-               break;
-       case ENTRY_TYPE_DNS_1:
-               title = entry_info->title_txt;
-               guide_txt = entry_info->guide_txt;
-               panel_type = ELM_INPUT_PANEL_LAYOUT_IP;
-               accepted = "0123456789.";
-               break;
-       case ENTRY_TYPE_DNS_2:
-               title = entry_info->title_txt;
-               guide_txt = entry_info->guide_txt;
-               panel_type = ELM_INPUT_PANEL_LAYOUT_IP;
-               accepted = "0123456789.";
-               break;
-       case ENTRY_TYPE_PROXY_ADDR:
-               title = entry_info->title_txt;
-               guide_txt = DEFAULT_GUIDE_PROXY_IP;
-               panel_type = ELM_INPUT_PANEL_LAYOUT_URL;
-               accepted = "0123456789.abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-               break;
-       case ENTRY_TYPE_PROXY_PORT:
-               title = entry_info->title_txt;
-               guide_txt = DEFAULT_GUIDE_PROXY_PORT;
-               panel_type = ELM_INPUT_PANEL_LAYOUT_NUMBERONLY;
-               break;
-       default:
-               return NULL;
-       }
+       if (g_strcmp0(part, "elm.icon.entry") == 0) {
+               Evas_Object *entry = NULL;
+               char *guide_txt = NULL;
+               char *accepted = NULL;
+               Elm_Input_Panel_Layout panel_type;
+
+               Elm_Entry_Filter_Limit_Size limit_filter_data;
+
+               switch (entry_info->entry_id)
+               {
+               case ENTRY_TYPE_IP_ADDR:
+                       guide_txt = entry_info->guide_txt;
+                       panel_type = ELM_INPUT_PANEL_LAYOUT_IP;
+                       accepted = "0123456789.";
+                       break;
+               case ENTRY_TYPE_SUBNET_MASK:
+                       guide_txt = entry_info->guide_txt;
+                       panel_type = ELM_INPUT_PANEL_LAYOUT_IP;
+                       accepted = "0123456789.";
+                       break;
+               case ENTRY_TYPE_GATEWAY:
+                       guide_txt = entry_info->guide_txt;
+                       panel_type = ELM_INPUT_PANEL_LAYOUT_IP;
+                       accepted = "0123456789.";
+                       break;
+               case ENTRY_TYPE_DNS_1:
+                       guide_txt = entry_info->guide_txt;
+                       panel_type = ELM_INPUT_PANEL_LAYOUT_IP;
+                       accepted = "0123456789.";
+                       break;
+               case ENTRY_TYPE_DNS_2:
+                       guide_txt = entry_info->guide_txt;
+                       panel_type = ELM_INPUT_PANEL_LAYOUT_IP;
+                       accepted = "0123456789.";
+                       break;
+               case ENTRY_TYPE_PROXY_ADDR:
+                       guide_txt = DEFAULT_GUIDE_PROXY_IP;
+                       panel_type = ELM_INPUT_PANEL_LAYOUT_URL;
+                       accepted = "0123456789.abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+                       break;
+               case ENTRY_TYPE_PROXY_PORT:
+                       guide_txt = DEFAULT_GUIDE_PROXY_PORT;
+                       panel_type = ELM_INPUT_PANEL_LAYOUT_NUMBERONLY;
+                       break;
+               default:
+                       return NULL;
+               }
 
-       elm_object_part_text_set(layout, "elm.text", title);
-       elm_object_part_text_set(layout, "elm.guidetext", guide_txt);
-       elm_entry_password_set(entry, hide_entry_txt);
-       if (entry_info->entry_txt && (strlen(entry_info->entry_txt) > 0)) {
-               elm_entry_entry_set(entry, entry_info->entry_txt);
-               elm_object_signal_emit(layout, "elm,state,guidetext,hide", "elm");
-       }
-       elm_entry_input_panel_layout_set(entry, panel_type);
-       limit_filter_data.max_char_count = 32;
-       elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, &limit_filter_data);
-       elm_entry_context_menu_disabled_set(entry, EINA_TRUE);
+               entry = elm_entry_add(obj);
+               elm_entry_scrollable_set(entry, EINA_TRUE);
+               elm_entry_single_line_set(entry, EINA_TRUE);
+               elm_entry_password_set(entry, EINA_FALSE);
+               elm_object_part_text_set(entry, "elm.guide", guide_txt);
+               if (entry_info->entry_txt && (strlen(entry_info->entry_txt) > 0)) {
+                       elm_entry_entry_set(entry, entry_info->entry_txt);
+               }
 
-       Elm_Entry_Filter_Accept_Set digits_filter_data;
-       memset(&digits_filter_data, 0, sizeof(Elm_Entry_Filter_Accept_Set));
-       digits_filter_data.accepted = accepted;
-       elm_entry_markup_filter_append(entry, elm_entry_filter_accept_set, &digits_filter_data);
+               elm_entry_input_panel_layout_set(entry, panel_type);
 
-       if (entry_info->input_panel_cb) {
-               Ecore_IMF_Context *imf_ctxt = elm_entry_imf_context_get(entry);
-               if (imf_ctxt) {
-                       ecore_imf_context_input_panel_event_callback_add(imf_ctxt, ECORE_IMF_INPUT_PANEL_STATE_EVENT, entry_info->input_panel_cb, entry_info->input_panel_cb_data);
+               limit_filter_data.max_char_count = 32;
+               elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, &limit_filter_data);
+               elm_entry_context_menu_disabled_set(entry, EINA_TRUE);
+
+               Elm_Entry_Filter_Accept_Set digits_filter_data;
+               memset(&digits_filter_data, 0, sizeof(Elm_Entry_Filter_Accept_Set));
+               digits_filter_data.accepted = accepted;
+               elm_entry_markup_filter_append(entry, elm_entry_filter_accept_set, &digits_filter_data);
+
+               if (entry_info->input_panel_cb) {
+                       Ecore_IMF_Context *imf_ctxt = elm_entry_imf_context_get(entry);
+                       if (imf_ctxt) {
+                               ecore_imf_context_input_panel_event_callback_add(imf_ctxt, ECORE_IMF_INPUT_PANEL_STATE_EVENT, entry_info->input_panel_cb, entry_info->input_panel_cb_data);
+                       }
                }
+
+               evas_object_smart_callback_add(entry, "cursor,changed", _ip_info_entry_cursor_changed_cb, entry_info);
+               evas_object_smart_callback_add(entry, "changed", _ip_info_entry_changed_cb, entry_info);
+               evas_object_smart_callback_add(entry, "focused", _ip_info_entry_focused_cb, entry_info);
+               evas_object_smart_callback_add(entry, "unfocused", _ip_info_entry_unfocused_cb, entry_info);
+
+               return entry;
+       } else if (g_strcmp0(part, "elm.icon.eraser") == 0) {
+               Evas_Object *btn = elm_button_add(obj);
+               elm_object_style_set(btn, "editfield_clear");
+               evas_object_smart_callback_add(btn, "clicked", _ip_info_entry_eraser_clicked_cb, entry_info);
+               return btn;
        }
-       evas_object_smart_callback_add(entry, "cursor,changed", _ip_info_entry_cursor_changed_cb, entry_info);
-       evas_object_smart_callback_add(entry, "changed", _ip_info_entry_changed_cb, layout);
-       evas_object_smart_callback_add(entry, "focused", _ip_info_entry_focused_cb, layout);
-       evas_object_smart_callback_add(entry, "unfocused", _ip_info_entry_unfocused_cb, layout);
-       elm_object_signal_callback_add(layout, "elm,eraser,clicked", "elm", _ip_info_entry_eraser_clicked_cb, entry);
-       evas_object_show(entry);
-
-       entry_info->layout = layout;
-       return layout;
+
+       return NULL;
 }
 
 static void _ip_info_entry_item_del(void *data, Evas_Object *obj)
@@ -344,7 +365,7 @@ static void _ip_info_entry_item_del(void *data, Evas_Object *obj)
                g_free(entry_info->entry_txt);
 
        if (entry_info->input_panel_cb) {
-               Evas_Object *entry = common_utils_entry_layout_get_entry(entry_info->layout);
+               Evas_Object *entry = elm_object_item_part_content_get(entry_info->item, "elm.icon.entry");
                Ecore_IMF_Context *imf_ctxt = elm_entry_imf_context_get(entry);
                if (imf_ctxt) {
                        ecore_imf_context_input_panel_event_callback_del(imf_ctxt, ECORE_IMF_INPUT_PANEL_STATE_EVENT, entry_info->input_panel_cb);
@@ -382,10 +403,11 @@ static void _create_static_ip_table(ip_info_list_t *ip_info_list_data)
        edit_box_details->entry_txt = txt;
        edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb;
        edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data;
-       ip_info_list_data->ip_addr_item = elm_genlist_item_insert_after(ip_info_list_data->genlist, &ip_entry_itc, edit_box_details, NULL, ip_info_list_data->ip_toggle_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
-       elm_genlist_item_select_mode_set(ip_info_list_data->ip_addr_item, ELM_OBJECT_SELECT_MODE_NONE);
-       Evas_Object *ao = elm_object_item_access_object_get(ip_info_list_data->ip_addr_item);
+       edit_box_details->item = elm_genlist_item_insert_after(ip_info_list_data->genlist, &ip_entry_itc, edit_box_details, NULL, ip_info_list_data->ip_toggle_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+       elm_genlist_item_select_mode_set(edit_box_details->item, ELM_OBJECT_SELECT_MODE_NONE);
+       Evas_Object *ao = elm_object_item_access_object_get(edit_box_details->item);
        elm_access_info_cb_set(ao, ELM_ACCESS_INFO, _access_info_cb, edit_box_details);
+       ip_info_list_data->ip_addr_item = edit_box_details->item;
 
        /* Subnet Mask */
        wifi_ap_get_subnet_mask(ap, WIFI_ADDRESS_FAMILY_IPV4, &txt);
@@ -395,10 +417,11 @@ static void _create_static_ip_table(ip_info_list_t *ip_info_list_data)
        edit_box_details->entry_txt = txt;
        edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb;
        edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data;
-       ip_info_list_data->subnet_mask_item = elm_genlist_item_insert_after(ip_info_list_data->genlist, &ip_entry_itc, edit_box_details, NULL, ip_info_list_data->ip_addr_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
-       elm_genlist_item_select_mode_set(ip_info_list_data->subnet_mask_item, ELM_OBJECT_SELECT_MODE_NONE);
-       ao = elm_object_item_access_object_get(ip_info_list_data->subnet_mask_item);
+       edit_box_details->item = elm_genlist_item_insert_after(ip_info_list_data->genlist, &ip_entry_itc, edit_box_details, NULL, ip_info_list_data->ip_addr_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+       elm_genlist_item_select_mode_set(edit_box_details->item, ELM_OBJECT_SELECT_MODE_NONE);
+       ao = elm_object_item_access_object_get(edit_box_details->item);
        elm_access_info_cb_set(ao, ELM_ACCESS_INFO, _access_info_cb, edit_box_details);
+       ip_info_list_data->subnet_mask_item = edit_box_details->item;
 
        /* Gateway Address */
        wifi_ap_get_gateway_address(ap, WIFI_ADDRESS_FAMILY_IPV4, &txt);
@@ -408,10 +431,11 @@ static void _create_static_ip_table(ip_info_list_t *ip_info_list_data)
        edit_box_details->entry_txt = txt;
        edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb;
        edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data;
-       ip_info_list_data->gateway_addr_item = elm_genlist_item_insert_after(ip_info_list_data->genlist, &ip_entry_itc, edit_box_details, NULL, ip_info_list_data->subnet_mask_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
-       elm_genlist_item_select_mode_set(ip_info_list_data->gateway_addr_item, ELM_OBJECT_SELECT_MODE_NONE);
-       ao = elm_object_item_access_object_get(ip_info_list_data->gateway_addr_item);
+       edit_box_details->item = elm_genlist_item_insert_after(ip_info_list_data->genlist, &ip_entry_itc, edit_box_details, NULL, ip_info_list_data->subnet_mask_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+       elm_genlist_item_select_mode_set(edit_box_details->item, ELM_OBJECT_SELECT_MODE_NONE);
+       ao = elm_object_item_access_object_get(edit_box_details->item);
        elm_access_info_cb_set(ao, ELM_ACCESS_INFO, _access_info_cb, edit_box_details);
+       ip_info_list_data->gateway_addr_item = edit_box_details->item;
 
        /* DNS 1 */
        wifi_ap_get_dns_address(ap, 1, WIFI_ADDRESS_FAMILY_IPV4, &txt);
@@ -421,10 +445,11 @@ static void _create_static_ip_table(ip_info_list_t *ip_info_list_data)
        edit_box_details->entry_txt = txt;
        edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb;
        edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data;
-       ip_info_list_data->dns_1_item = elm_genlist_item_insert_after(ip_info_list_data->genlist, &ip_entry_itc, edit_box_details, NULL, ip_info_list_data->gateway_addr_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
-       elm_genlist_item_select_mode_set(ip_info_list_data->dns_1_item, ELM_OBJECT_SELECT_MODE_NONE);
-       ao = elm_object_item_access_object_get(ip_info_list_data->dns_1_item);
+       edit_box_details->item = elm_genlist_item_insert_after(ip_info_list_data->genlist, &ip_entry_itc, edit_box_details, NULL, ip_info_list_data->gateway_addr_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+       elm_genlist_item_select_mode_set(edit_box_details->item, ELM_OBJECT_SELECT_MODE_NONE);
+       ao = elm_object_item_access_object_get(edit_box_details->item);
        elm_access_info_cb_set(ao, ELM_ACCESS_INFO, _access_info_cb, edit_box_details);
+       ip_info_list_data->dns_1_item = edit_box_details->item;
 
        /* DNS 2 */
        wifi_ap_get_dns_address(ap, 2, WIFI_ADDRESS_FAMILY_IPV4, &txt);
@@ -434,10 +459,11 @@ static void _create_static_ip_table(ip_info_list_t *ip_info_list_data)
        edit_box_details->entry_txt = txt;
        edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb;
        edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data;
-       ip_info_list_data->dns_2_item = elm_genlist_item_insert_after(ip_info_list_data->genlist, &ip_entry_itc, edit_box_details, NULL, ip_info_list_data->dns_1_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
-       elm_genlist_item_select_mode_set(ip_info_list_data->dns_2_item, ELM_OBJECT_SELECT_MODE_NONE);
-       ao = elm_object_item_access_object_get(ip_info_list_data->dns_2_item);
+       edit_box_details->item = elm_genlist_item_insert_after(ip_info_list_data->genlist, &ip_entry_itc, edit_box_details, NULL, ip_info_list_data->dns_1_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+       elm_genlist_item_select_mode_set(edit_box_details->item, ELM_OBJECT_SELECT_MODE_NONE);
+       ao = elm_object_item_access_object_get(edit_box_details->item);
        elm_access_info_cb_set(ao, ELM_ACCESS_INFO, _access_info_cb, edit_box_details);
+       ip_info_list_data->dns_2_item = edit_box_details->item;
 
        __COMMON_FUNC_EXIT__;
 
@@ -741,8 +767,8 @@ ip_info_list_t *ip_info_append_items(wifi_ap_h ap, const char *pkg_name,
        description_itc.func.state_get = NULL;
        description_itc.func.del = _ip_info_detail_description_del;
 
-       ip_entry_itc.item_style = "dialogue/1icon";
-       ip_entry_itc.func.text_get = NULL;
+       ip_entry_itc.item_style = "dialogue/editfield/title";
+       ip_entry_itc.func.text_get = _ip_info_entry_item_text_get;
        ip_entry_itc.func.content_get = _ip_info_entry_item_content_get;
        ip_entry_itc.func.state_get = NULL;
        ip_entry_itc.func.del = _ip_info_entry_item_del;
@@ -818,10 +844,11 @@ ip_info_list_t *ip_info_append_items(wifi_ap_h ap, const char *pkg_name,
        edit_box_details->guide_txt = DEFAULT_GUIDE_PROXY_IP;
        edit_box_details->input_panel_cb = input_panel_cb;
        edit_box_details->input_panel_cb_data = input_panel_cb_data;
-       ip_info_list_data->proxy_addr_item = elm_genlist_item_append(genlist, &ip_entry_itc, edit_box_details, NULL, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
-       elm_genlist_item_select_mode_set(ip_info_list_data->proxy_addr_item, ELM_OBJECT_SELECT_MODE_NONE);
-       Evas_Object *ao = elm_object_item_access_object_get(ip_info_list_data->proxy_addr_item);
+       edit_box_details->item = elm_genlist_item_append(genlist, &ip_entry_itc, edit_box_details, NULL, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+       elm_genlist_item_select_mode_set(edit_box_details->item, ELM_OBJECT_SELECT_MODE_NONE);
+       Evas_Object *ao = elm_object_item_access_object_get(edit_box_details->item);
        elm_access_info_cb_set(ao, ELM_ACCESS_INFO, _access_info_cb, edit_box_details);
+       ip_info_list_data->proxy_addr_item = edit_box_details->item;
 
        edit_box_details = g_new0(common_utils_entry_info_t, 1);
        edit_box_details->entry_id = ENTRY_TYPE_PROXY_PORT;
@@ -830,10 +857,11 @@ ip_info_list_t *ip_info_append_items(wifi_ap_h ap, const char *pkg_name,
        edit_box_details->guide_txt = DEFAULT_GUIDE_PROXY_PORT;
        edit_box_details->input_panel_cb = input_panel_cb;
        edit_box_details->input_panel_cb_data = input_panel_cb_data;
-       ip_info_list_data->proxy_port_item = elm_genlist_item_append(genlist, &ip_entry_itc, edit_box_details, NULL, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
-       elm_genlist_item_select_mode_set(ip_info_list_data->proxy_port_item, ELM_OBJECT_SELECT_MODE_NONE);
-       ao = elm_object_item_access_object_get(ip_info_list_data->proxy_port_item);
+       edit_box_details->item = elm_genlist_item_append(genlist, &ip_entry_itc, edit_box_details, NULL, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
+       elm_genlist_item_select_mode_set(edit_box_details->item, ELM_OBJECT_SELECT_MODE_NONE);
+       ao = elm_object_item_access_object_get(edit_box_details->item);
        elm_access_info_cb_set(ao, ELM_ACCESS_INFO, _access_info_cb, edit_box_details);
+       ip_info_list_data->proxy_port_item = edit_box_details->item;
 
        g_free(proxy_data);
 
index 844d943..d3cb405 100644 (file)
@@ -218,7 +218,8 @@ void common_utils_set_edit_box_imf_panel_evnt_cb(Elm_Object_Item *item,
 
        entry_info->input_panel_cb = input_panel_cb;
        entry_info->input_panel_cb_data = user_data;
-       Evas_Object *entry = common_utils_entry_layout_get_entry(entry_info->layout);
+
+       Evas_Object *entry = elm_object_item_part_content_get(item, "elm.icon.entry");
        Ecore_IMF_Context *imf_ctxt = elm_entry_imf_context_get(entry);
        if (imf_ctxt && entry_info->input_panel_cb) {
                /* Deleting the previously attached callback */
@@ -239,12 +240,10 @@ void common_utils_set_edit_box_imf_panel_evnt_cb(Elm_Object_Item *item,
 void common_utils_edit_box_focus_set(Elm_Object_Item *item, Eina_Bool focus_set)
 {
        __COMMON_FUNC_ENTER__;
-       common_utils_entry_info_t *entry_info;
-       entry_info = elm_object_item_data_get(item);
-       if (!entry_info)
+       if (!item)
                return;
 
-       Evas_Object *entry = common_utils_entry_layout_get_entry(entry_info->layout);
+       Evas_Object *entry = elm_object_item_part_content_get(item, "elm.icon.entry");
        elm_object_focus_set(entry, focus_set);
 
        __COMMON_FUNC_EXIT__;
@@ -453,8 +452,7 @@ int common_utils_send_message_to_net_popup(const char *title, const char *conten
        bundle_add(b, "_SYSPOPUP_TYPE_", type);
        bundle_add(b, "_AP_NAME_", ssid);
 
-       ret = aul_launch_app("org.tizen.net-popup", b);
-
+       ret = aul_launch_app("net.netpopup", b);
        bundle_free(b);
 
        return ret;
index c48e2be..7ef6e2b 100644 (file)
@@ -50,7 +50,7 @@ typedef struct {
        char *title_txt;
        char *guide_txt;
        char *entry_txt;
-       Evas_Object *layout;
+       Elm_Object_Item *item;
        imf_ctxt_panel_cb_t input_panel_cb;
        void *input_panel_cb_data;
 } common_utils_entry_info_t;