Fixed build warning

[apps/native/ug-mobile-ap.git] / src / mh_view_wifi_setup.c

diff --git a/src/mh_view_wifi_setup.c b/src/mh_view_wifi_setup.c
index 3fbeb7a..37c46ec 100755 (executable)
--- a/src/mh_view_wifi_setup.c
+++ b/src/mh_view_wifi_setup.c
@@ -373,7 +373,7 @@ static void __pw_entry_activated_cb(void *data, Evas_Object *obj, void *event_in
 static void __pw_entry_focused_cb(void *data, Evas_Object *obj, void *event_info)
 {
        __MOBILE_AP_FUNC_ENTER__;
-       evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, __pw_entry_focused_cb);
+       evas_object_smart_callback_del(obj, "focused", __pw_entry_focused_cb);
 
         elm_object_focus_set(obj, EINA_TRUE);
         elm_entry_cursor_end_set(obj);
@@ -464,7 +464,6 @@ static Evas_Object *__get_pw_entry(void *data, Evas_Object *parent)
        elm_entry_scrollable_set(entry, EINA_TRUE);
        elm_entry_password_set(entry, EINA_FALSE);
 
-       st->pw_entry = entry;
        evas_object_smart_callback_add(entry, "language,changed",
                        __pw_entry_language_changed_cb, ad);
 
@@ -499,7 +498,7 @@ static Evas_Object *__get_pw_entry(void *data, Evas_Object *parent)
                }
        }
 
-       elm_entry_input_panel_return_key_type_set(st->pw_entry,
+       elm_entry_input_panel_return_key_type_set(entry,
                        ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
 
        clr_btn = elm_button_add(entry);
@@ -522,39 +521,22 @@ static Evas_Object *__get_pw_entry(void *data, Evas_Object *parent)
        evas_object_event_callback_add(entry, EVAS_CALLBACK_SHOW,
                        __pw_entry_show_cb, NULL);
 
-//     elm_entry_editable_set(entry, EINA_TRUE);
        elm_object_focus_set(entry, EINA_TRUE);
        elm_entry_input_panel_show(entry);
        elm_object_part_content_set(parent, "elm.swallow.content", entry);
 
-       __MOBILE_AP_FUNC_EXIT__;
-       return st->pw_entry;
-}
-
-static char *__gl_pw_text_get(void *data, Evas_Object *obj, const char *part)
-{
-       __MOBILE_AP_FUNC_ENTER__;
-       char buf[MH_LABEL_LENGTH_MAX] = {0, };
-
-       if (data == NULL || obj == NULL || part == NULL) {
-               ERR("Invalid param\n");
-               return NULL;
-       }
-
-       if (!strcmp("elm.text.main", part)) {
-               snprintf(buf, MH_LABEL_LENGTH_MAX, "<font_size=30>%s</font_size>", STR_PASSWORD);
-               return strdup(buf);
-       }
+       st->pw_entry = entry;
 
        __MOBILE_AP_FUNC_EXIT__;
-       return NULL;
+       return st->pw_entry;
 }
 
 static Evas_Object *__gl_pw_content_get(void *data, Evas_Object *obj, const char *part)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       Evas_Object * layout = NULL;
+       int w = 720;
+       int h = 60;
 
        if (data == NULL) {
                ERR("data is null \n");
@@ -562,15 +544,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, "<text align=left><font_size=30>%s</font_size></text>", 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 +678,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;
@@ -921,17 +927,11 @@ static void __select_passphrase_item(void *data, Evas_Object *obj, void *event_i
                return;
        }
 
-       Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-       Evas_Object *layout = NULL;
        mh_appdata_t *ad = (mh_appdata_t *)data;
+       mh_wifi_setting_view_t *st = &ad->setup;
 
-       elm_genlist_item_selected_set(item, EINA_FALSE);
-
-       layout = elm_layout_add(obj);
-       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       __get_pw_entry(ad, layout);
+       elm_object_focus_set(st->pw_entry, EINA_TRUE);
 
-       evas_object_show(layout);
        __MOBILE_AP_FUNC_EXIT__;
        return;
 }