From: Priya Kohli Date: Fri, 26 May 2017 10:31:02 +0000 (+0530) Subject: If IP value entered is greater than 255 than the value will be converted X-Git-Tag: submit/tizen/20170614.011152~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3f67693816d06537c31c67fe797496a482cf30c;p=profile%2Ftv%2Fapps%2Fnative%2Fair_settings.git If IP value entered is greater than 255 than the value will be converted to 255 and focus will move to next octet. Change-Id: Iddbab5b2882489ade9083dad611053a680b98b14 Signed-off-by: Priya Kohli --- diff --git a/src/view/view_new_network.c b/src/view/view_new_network.c index 2d0f355..449e7d1 100644 --- a/src/view/view_new_network.c +++ b/src/view/view_new_network.c @@ -148,7 +148,6 @@ static void _update_profile_from_input_data(struct _priv *priv) if (priv->ip_menu == 0) { if (priv->dns_menu == 0) { - _ERR("2"); memset(priv->conn->wired_dns, 0, NETWORK_ADDRESS_MAX); } else { /* Get DNS Address manually */ @@ -455,49 +454,52 @@ static void _unfocused_cb(void *data, Evas_Object *obj, void *ei) } } +static void set_focus_next_octet(struct _priv *priv, Evas_Object *obj) +{ + if (obj == priv->content_manual->ip1) + elm_object_focus_set(priv->content_manual->ip2, EINA_TRUE); + if (obj == priv->content_manual->ip2) + elm_object_focus_set(priv->content_manual->ip3, EINA_TRUE); + if (obj == priv->content_manual->ip3) + elm_object_focus_set(priv->content_manual->ip4, EINA_TRUE); + if (obj == priv->content_manual->ip4) + elm_object_focus_set(priv->content_manual->sub_ip1, EINA_TRUE); + + if (obj == priv->content_manual->sub_ip1) + elm_object_focus_set(priv->content_manual->sub_ip2, EINA_TRUE); + if (obj == priv->content_manual->sub_ip2) + elm_object_focus_set(priv->content_manual->sub_ip3, EINA_TRUE); + if (obj == priv->content_manual->sub_ip3) + elm_object_focus_set(priv->content_manual->sub_ip4, EINA_TRUE); + if (obj == priv->content_manual->sub_ip4) + elm_object_focus_set(priv->content_manual->gateway_ip1, EINA_TRUE); + + if (obj == priv->content_manual->gateway_ip1) + elm_object_focus_set(priv->content_manual->gateway_ip2, EINA_TRUE); + if (obj == priv->content_manual->gateway_ip2) + elm_object_focus_set(priv->content_manual->gateway_ip3, EINA_TRUE); + if (obj == priv->content_manual->gateway_ip3) + elm_object_focus_set(priv->content_manual->gateway_ip4, EINA_TRUE); + if (obj == priv->content_manual->gateway_ip4) + elm_object_focus_set(priv->content_manual->dns_ip1, EINA_TRUE); + + if (obj == priv->content_manual->dns_ip1) + elm_object_focus_set(priv->content_manual->dns_ip2, EINA_TRUE); + if (obj == priv->content_manual->dns_ip2) + elm_object_focus_set(priv->content_manual->dns_ip3, EINA_TRUE); + if (obj == priv->content_manual->dns_ip3) + elm_object_focus_set(priv->content_manual->dns_ip4, EINA_TRUE); + if (obj == priv->content_manual->dns_ip4) + elm_object_focus_set(priv->btn_done, EINA_TRUE); +} + static void _key_down_cb(void *data, Evas *e, Evas_Object *obj, void *ei) { struct _priv *priv = data; Evas_Event_Key_Down *ev = ei; - if (!strcmp(ev->key, KEY_ENTER)) { - /* set focus to next item */ - if (obj == priv->content_manual->ip1) - elm_object_focus_set(priv->content_manual->ip2, EINA_TRUE); - if (obj == priv->content_manual->ip2) - elm_object_focus_set(priv->content_manual->ip3, EINA_TRUE); - if (obj == priv->content_manual->ip3) - elm_object_focus_set(priv->content_manual->ip4, EINA_TRUE); - if (obj == priv->content_manual->ip4) - elm_object_focus_set(priv->content_manual->sub_ip1, EINA_TRUE); - - if (obj == priv->content_manual->sub_ip1) - elm_object_focus_set(priv->content_manual->sub_ip2, EINA_TRUE); - if (obj == priv->content_manual->sub_ip2) - elm_object_focus_set(priv->content_manual->sub_ip3, EINA_TRUE); - if (obj == priv->content_manual->sub_ip3) - elm_object_focus_set(priv->content_manual->sub_ip4, EINA_TRUE); - if (obj == priv->content_manual->sub_ip4) - elm_object_focus_set(priv->content_manual->gateway_ip1, EINA_TRUE); - - if (obj == priv->content_manual->gateway_ip1) - elm_object_focus_set(priv->content_manual->gateway_ip2, EINA_TRUE); - if (obj == priv->content_manual->gateway_ip2) - elm_object_focus_set(priv->content_manual->gateway_ip3, EINA_TRUE); - if (obj == priv->content_manual->gateway_ip3) - elm_object_focus_set(priv->content_manual->gateway_ip4, EINA_TRUE); - if (obj == priv->content_manual->gateway_ip4) - elm_object_focus_set(priv->content_manual->dns_ip1, EINA_TRUE); - - if (obj == priv->content_manual->dns_ip1) - elm_object_focus_set(priv->content_manual->dns_ip2, EINA_TRUE); - if (obj == priv->content_manual->dns_ip2) - elm_object_focus_set(priv->content_manual->dns_ip3, EINA_TRUE); - if (obj == priv->content_manual->dns_ip3) - elm_object_focus_set(priv->content_manual->dns_ip4, EINA_TRUE); - if (obj == priv->content_manual->dns_ip4) - elm_object_focus_set(priv->btn_done, EINA_TRUE); - } + if (!strcmp(ev->key, KEY_ENTER)) + set_focus_next_octet(priv, obj); /* Update done button state */ _update_entry_input_state(priv); @@ -661,7 +663,9 @@ static void _markup_cb(void *data, Evas_Object *entry, char **text) *text = NULL; tmp = elm_entry_markup_to_utf8(buf); + snprintf(tmp, sizeof(4*sizeof(char)), "%d", 255); elm_entry_entry_set(entry, tmp); + set_focus_next_octet(priv, entry); free(tmp); return; }