From 89ab9f5efeadb756db98b86325497b845958ce4d Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Mon, 2 May 2016 18:53:43 +0900 Subject: [PATCH] Add label for password entry Change-Id: Iab178775bcb40c31df187f303162c14ed4b2db59 Signed-off-by: Seonah Moon --- packaging/ug-setting-mobileap-efl.spec | 2 +- src/mh_view_wifi_setup.c | 37 ++++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/packaging/ug-setting-mobileap-efl.spec b/packaging/ug-setting-mobileap-efl.spec index 0ee94b1..b34a06e 100755 --- a/packaging/ug-setting-mobileap-efl.spec +++ b/packaging/ug-setting-mobileap-efl.spec @@ -3,7 +3,7 @@ Name: ug-setting-mobileap-efl Summary: Tethering UI Gadget Library -Version: 1.0.132 +Version: 1.0.133 Release: 1 Group: App/Network License: Flora-1.1 diff --git a/src/mh_view_wifi_setup.c b/src/mh_view_wifi_setup.c index 3fbeb7a..8bd3111 100755 --- a/src/mh_view_wifi_setup.c +++ b/src/mh_view_wifi_setup.c @@ -554,7 +554,8 @@ static Evas_Object *__gl_pw_content_get(void *data, Evas_Object *obj, const char { __MOBILE_AP_FUNC_ENTER__; - Evas_Object * layout = NULL; + int w = 720; + int h = 60; if (data == NULL) { ERR("data is null \n"); @@ -562,15 +563,39 @@ static Evas_Object *__gl_pw_content_get(void *data, Evas_Object *obj, const char } if (!strcmp(part, "elm.swallow.content")) { - layout = elm_layout_add(obj); + Evas_Object *box = elm_box_add(obj); + Evas_Object *label = elm_label_add(box); + Evas_Object *layout = elm_layout_add(box); + char buf[MH_LABEL_LENGTH_MAX] = {0, }; + + elm_box_align_set(box, 0.5, 0.5); + + /* Set label for name field */ + snprintf(buf, MH_LABEL_LENGTH_MAX, "%s", STR_PASSWORD); + 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); + evas_object_size_hint_padding_set(label, ELM_SCALE_SIZE(10), ELM_SCALE_SIZE(10), ELM_SCALE_SIZE(10), ELM_SCALE_SIZE(10)); + elm_box_pack_end(box, label); + evas_object_show(label); + + /* Set layout for entry field */ elm_layout_theme_set(layout, "layout", "editfield", "singleline"); - evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, 0.0); - evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, 0.0); + 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); + __get_pw_entry(data, layout); + evas_object_show(layout); + elm_box_pack_end(box, layout); + + evas_object_size_hint_min_set(box, ELM_SCALE_SIZE(w), ELM_SCALE_SIZE(h)); + evas_object_show(box); + + return box; } __MOBILE_AP_FUNC_EXIT__; - return layout; + return NULL; } static void __gl_hide_item_sel(void *data, Evas_Object *obj, void *event_info) @@ -672,7 +697,7 @@ static void __set_genlist_itc(mh_appdata_t *ad) return; } ad->setup.pw_itc->item_style = MH_GENLIST_FULL_CONTENT_STYLE; -// ad->setup.pw_itc->func.text_get = __gl_pw_text_get; + ad->setup.pw_itc->func.text_get = NULL; ad->setup.pw_itc->func.content_get = __gl_pw_content_get; ad->setup.pw_itc->func.state_get = NULL; ad->setup.pw_itc->func.del = NULL; -- 2.7.4