Fixed some issues for EAP

unable to identity, password and dropdown in EAP network tab

Change-Id: Ie2bbfe8b41b240693dc6ef363457d93cce63f408
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 14e79a8..e9b2fa5 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,7 +1,7 @@
 %define _unpackaged_files_terminate_build 0
 Name:          wifi-efl-ug
 Summary:       Wi-Fi UI Gadget for TIZEN
-Version:       1.0.207
+Version:       1.0.208
 Release:       1
 Group:         App/Network
 License:       Flora-1.1

diff --git a/sources/libraries/Common/common_eap_connect.c b/sources/libraries/Common/common_eap_connect.c
index d0c9dd9..2e98071 100755 (executable)
--- a/sources/libraries/Common/common_eap_connect.c
+++ b/sources/libraries/Common/common_eap_connect.c
@@ -34,6 +34,7 @@
 #include "common_ip_info.h"
 
 #define GENLIST_ITEM_HEIGHT                            96
+#define MAX_LABEL_LENGTH                               512
 
 #define EAP_TLS_PATH                   "/tmp/"
 #define EAP_TLS_CA_CERT_PATH           "ca_cert.pem"
@@ -768,8 +769,7 @@ static Evas_Object *_gl_eap_auth_content_get(void *data,
 
        if (!strcmp(part, "elm.swallow.icon.0")) {
                ly = elm_layout_add(obj);
-               elm_layout_file_set(ly, CUSTOM_EDITFIELD_PATH,
-                               "eap_dropdown_button");
+               elm_layout_file_set(ly, CUSTOM_EDITFIELD_PATH, "eap_dropdown_button");
                btn = elm_button_add(obj);
 
                if (sel_sub_item_id == EAP_SEC_AUTH_NONE) {
@@ -975,14 +975,22 @@ static Evas_Object *_gl_eap_entry_item_content_get(void *data, Evas_Object *obj,
                return NULL;
        }
 
-       if (g_strcmp0(part, "elm.swallow.icon.0") == 0) {
+       if (g_strcmp0(part, "elm.swallow.content") == 0) {
                Evas_Object *entry = NULL;
+               Evas_Object *box = NULL;
+               Evas_Object *tpad = NULL;
+               Evas_Object *lpad = NULL;
+               Evas_Object *label = NULL;
+               Evas_Object *layout = NULL;
+               Evas_Object *editfield = NULL;
+               char buf[MAX_LABEL_LENGTH] = {0, };
                char *guide_txt = NULL;
                char *accepted = NULL;
                Eina_Bool hide_entry_txt = EINA_FALSE;
                Elm_Input_Panel_Layout panel_type;
                int return_key_type;
                eap_type_t eap_type;
+               int height = 60;
 
                eap_type = __common_eap_connect_popup_get_eap_type(entry_info->ap);
 
@@ -1010,33 +1018,65 @@ static Evas_Object *_gl_eap_entry_item_content_get(void *data, Evas_Object *obj,
                        return NULL;
                }
 
-               entry = elm_entry_add(obj);
-               retvm_if(NULL == entry, NULL);
-
-               elm_entry_single_line_set(entry, EINA_TRUE);
-               elm_entry_scrollable_set(entry, EINA_TRUE);
-               elm_entry_password_set(entry, hide_entry_txt);
-               elm_entry_prediction_allow_set(entry, EINA_FALSE);
-               elm_entry_autocapital_type_set(entry, ELM_AUTOCAPITAL_TYPE_NONE);
-
-               elm_object_domain_translatable_part_text_set(entry, "elm.guide",
+               entry = elm_box_add(obj);
+               elm_box_align_set(entry, 0.0, 0.0);
+
+               tpad = evas_object_rectangle_add(entry);
+               evas_object_size_hint_min_set(tpad, 0, ELM_SCALE_SIZE(10));
+               evas_object_show(tpad);
+               elm_box_pack_end(entry, tpad);
+
+               box = elm_box_add(entry);
+               evas_object_size_hint_align_set(box, 0.0, 0.0);
+               elm_box_horizontal_set(box, EINA_TRUE);
+               elm_box_pack_end(entry, box);
+               evas_object_show(box);
+
+               lpad = evas_object_rectangle_add(box);
+               evas_object_size_hint_min_set(lpad, ELM_SCALE_SIZE(15), 0);
+               evas_object_show(lpad);
+               elm_box_pack_end(box, lpad);
+               evas_object_show(box);
+
+               label = elm_label_add(box);
+               snprintf(buf, MAX_LABEL_LENGTH, "<font_size=30>%s</font_size>",
+                                       dgettext(PACKAGE, entry_info->title_txt));
+               elm_object_text_set(label, buf);
+               evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_size_hint_weight_set(label, 0.9, EVAS_HINT_EXPAND);
+               elm_box_pack_end(box, label);
+               evas_object_show(label);
+
+               layout = elm_layout_add(entry);
+               elm_layout_theme_set(layout, "layout", "editfield", "singleline");
+               evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+               editfield = elm_entry_add(layout);
+               elm_entry_single_line_set(editfield, EINA_TRUE);
+               elm_entry_scrollable_set(editfield, EINA_TRUE);
+               elm_entry_password_set(editfield, hide_entry_txt);
+               elm_entry_prediction_allow_set(editfield, EINA_FALSE);
+               elm_entry_autocapital_type_set(editfield, ELM_AUTOCAPITAL_TYPE_NONE);
+
+               elm_object_domain_translatable_part_text_set(editfield, "elm.guide",
                                PACKAGE, guide_txt);
                if (entry_info->entry_txt && (strlen(entry_info->entry_txt) > 0)) {
-                       elm_entry_entry_set(entry, entry_info->entry_txt);
+                       elm_entry_entry_set(editfield, entry_info->entry_txt);
                }
 
-               elm_entry_input_panel_layout_set(entry, panel_type);
-               elm_entry_input_panel_return_key_type_set(entry, return_key_type);
+               elm_entry_input_panel_layout_set(editfield, panel_type);
+               elm_entry_input_panel_return_key_type_set(editfield, return_key_type);
 
                limit_filter_data.max_char_count = 200;
-               elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, &limit_filter_data);
+               elm_entry_markup_filter_append(editfield, 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_markup_filter_append(editfield, elm_entry_filter_accept_set, &digits_filter_data);
 
-               Ecore_IMF_Context *imf_ctxt = elm_entry_imf_context_get(entry);
+               Ecore_IMF_Context *imf_ctxt = elm_entry_imf_context_get(editfield);
                if (imf_ctxt && entry_info->input_panel_cb) {
                        ecore_imf_context_input_panel_event_callback_add(imf_ctxt,
                                        ECORE_IMF_INPUT_PANEL_STATE_EVENT,
@@ -1045,15 +1085,23 @@ static Evas_Object *_gl_eap_entry_item_content_get(void *data, Evas_Object *obj,
                        DEBUG_LOG(UG_NAME_NORMAL, "set the imf ctxt cbs");
                }
 
-               evas_object_smart_callback_add(entry, "activated", _gl_eap_entry_key_enter_cb, entry_info);
-               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);
-               evas_object_smart_callback_add(entry, "maxlength,reached", _gl_eap_entry_maxlength_reached, NULL);
+               evas_object_smart_callback_add(editfield, "activated", _gl_eap_entry_key_enter_cb, entry_info);
+               evas_object_smart_callback_add(editfield, "cursor,changed", _gl_eap_entry_cursor_changed_cb, entry_info);
+               evas_object_smart_callback_add(editfield, "changed", _gl_eap_entry_changed_cb, entry_info);
+               evas_object_smart_callback_add(editfield, "focused", _gl_eap_entry_focused_cb, entry_info);
+               evas_object_smart_callback_add(editfield, "unfocused", _gl_eap_entry_unfocused_cb, entry_info);
+               evas_object_smart_callback_add(editfield, "maxlength,reached", _gl_eap_entry_maxlength_reached, NULL);
+
+               elm_object_part_content_set(layout, "elm.swallow.content", editfield);
+               evas_object_show(layout);
+               elm_box_pack_end(entry, layout);
+
+               evas_object_size_hint_min_set(entry, 0, ELM_SCALE_SIZE(height));
+               elm_object_focus_set(entry, EINA_FALSE);
+               evas_object_show(entry);
 
                if (entry_info->entry_id == ENTRY_TYPE_PASSWORD) {
-                       g_pwd_entry = entry;
+                       g_pwd_entry = editfield;
                }
 
                return entry;
@@ -1174,7 +1222,7 @@ 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 = WIFI_GENLIST_2LINE_BOTTOM_SWALLOW_STYLE;
+       g_eap_entry_itc.item_style = WIFI_GENLIST_FULL_STYLE;
        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;

diff --git a/sources/ui-gadget/edcs/custom_editfield.edc b/sources/ui-gadget/edcs/custom_editfield.edc
index 41b7b83..3472f6a 100755 (executable)
--- a/sources/ui-gadget/edcs/custom_editfield.edc
+++ b/sources/ui-gadget/edcs/custom_editfield.edc
@@ -308,49 +308,12 @@ group {
                name: "eap_dropdown_button";
                parts {
                        part {
-                               name: "bg";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 1.0;
-                               }
-                       }
-                       part {
-                               name: "pad_l";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 15 0;
-                                       fixed: 1 0;
-                                       align: 0.0 0.0;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "bg";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to: "bg";
-                                       }
-                                }
-                       }
-                       part {
-                               name: "pad_r";
-                               type: SPACER;
+                               name: "base";
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 15 0;
-                                       fixed: 1 0;
-                                       align: 1.0 0.0;
-                                       rel1 {
-                                               relative: 1.0 0.0;
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                       }
+                                       min: 300 60;
                                }
                        }
                        part {
@@ -359,12 +322,9 @@ group {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 58;
-                                       max: -1 58;
-                                       fixed: 1 1;
-                                       rel1 {relative: 1.0 0.0; to: "pad_l";}
-                                       rel2 {relative: 0.0 1.0; to: "pad_r";}
-                                       }
+                                       rel1.to: "base";
+                                       rel2.to: "base";
+                               }
                        }
                }
        }