From 384316d63d4c1326abc4d51482133b4338a726a3 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Wed, 27 Jul 2016 16:35:04 +0900 Subject: [PATCH] Add padding item to static IP and proxy settings Change-Id: Ica403caf009e60b3c2e23857c1666b9dec824018 --- packaging/wifi-efl-ug.spec | 2 +- .../wearable/inc/wearable-circle/view/layout_proxy_setting.h | 1 + sources/wearable/inc/wearable-circle/view/layout_static_ip.h | 1 + sources/wearable/src/wearable-circle/app_main.c | 11 +++++++++++ .../wearable/src/wearable-circle/view/layout_proxy_setting.c | 5 +++++ sources/wearable/src/wearable-circle/view/layout_static_ip.c | 8 +++++++- 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec index f9e1a06..9d2c362 100644 --- 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.199 +Version: 1.0.200 Release: 1 Group: App/Network License: Flora-1.1 diff --git a/sources/wearable/inc/wearable-circle/view/layout_proxy_setting.h b/sources/wearable/inc/wearable-circle/view/layout_proxy_setting.h index bfe0bed..f64f829 100755 --- a/sources/wearable/inc/wearable-circle/view/layout_proxy_setting.h +++ b/sources/wearable/inc/wearable-circle/view/layout_proxy_setting.h @@ -30,6 +30,7 @@ typedef enum { PROXY_SETTING_ITEM_TITLE, PROXY_SETTING_ITEM_ADDRESS, PROXY_SETTING_ITEM_PORT, + PROXY_SETTING_ITEM_EMPTY, PROXY_SETTING_ITEM_SIZE } proxy_setting_menu_type; diff --git a/sources/wearable/inc/wearable-circle/view/layout_static_ip.h b/sources/wearable/inc/wearable-circle/view/layout_static_ip.h index 8dd61e5..62c60fb 100755 --- a/sources/wearable/inc/wearable-circle/view/layout_static_ip.h +++ b/sources/wearable/inc/wearable-circle/view/layout_static_ip.h @@ -33,6 +33,7 @@ typedef enum { STATIC_IP_ITEM_GATEWAY, STATIC_IP_ITEM_DNS1, STATIC_IP_ITEM_DNS2, + STATIC_IP_ITEM_EMPTY, STATIC_IP_ITEM_SIZE } static_ip_menu_type; diff --git a/sources/wearable/src/wearable-circle/app_main.c b/sources/wearable/src/wearable-circle/app_main.c index 31e28b8..f16f619 100755 --- a/sources/wearable/src/wearable-circle/app_main.c +++ b/sources/wearable/src/wearable-circle/app_main.c @@ -2925,6 +2925,11 @@ static layout_static_ip_object *_static_ip_create(app_object *app_obj) layout_static_ip_set_tap_menu_cb(static_ip, STATIC_IP_ITEM_DNS2, __static_ip_menu_tap_cb, app_obj); + layout_static_ip_set_menu_cb(static_ip, STATIC_IP_ITEM_EMPTY, + NULL, NULL, NULL, NULL, NULL); + layout_static_ip_set_tap_menu_cb(static_ip, STATIC_IP_ITEM_EMPTY, + NULL, NULL); + layout_static_ip_set_tap_save_button_cb(static_ip, __static_ip_save_button_tap_cb, app_obj); @@ -3350,6 +3355,12 @@ static layout_proxy_setting_object *_proxy_setting_create(app_object *app_obj) layout_proxy_setting_set_tap_menu_cb(proxy_setting, PROXY_SETTING_ITEM_PORT, __proxy_setting_menu_tap_cb, app_obj); + layout_proxy_setting_set_menu_cb(proxy_setting, PROXY_SETTING_ITEM_EMPTY, + NULL, NULL, NULL, NULL, NULL); + layout_proxy_setting_set_tap_menu_cb(proxy_setting, PROXY_SETTING_ITEM_EMPTY, + NULL, NULL); + + layout_proxy_setting_set_tap_save_button_cb(proxy_setting, __proxy_setting_save_button_tap_cb, app_obj); diff --git a/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c b/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c index 0c9a548..977279e 100755 --- a/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c +++ b/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c @@ -115,6 +115,10 @@ static void _append_menu(layout_proxy_setting_object *self, proxy_setting_menu_t itc = create_genlist_itc("2text", self->menu_cb[type].text_get, NULL, NULL, NULL); break; + case PROXY_SETTING_ITEM_EMPTY: + itc = create_genlist_itc("padding", NULL, NULL, NULL, NULL); + break; + default: return; } @@ -170,6 +174,7 @@ gboolean layout_proxy_setting_create(layout_proxy_setting_object *self) _append_menu(self, PROXY_SETTING_ITEM_TITLE); _append_menu(self, PROXY_SETTING_ITEM_ADDRESS); _append_menu(self, PROXY_SETTING_ITEM_PORT); + _append_menu(self, PROXY_SETTING_ITEM_EMPTY); elm_object_part_content_set(self->layout, "elm.swallow.content", self->menu_list); diff --git a/sources/wearable/src/wearable-circle/view/layout_static_ip.c b/sources/wearable/src/wearable-circle/view/layout_static_ip.c index b937f06..97226ea 100755 --- a/sources/wearable/src/wearable-circle/view/layout_static_ip.c +++ b/sources/wearable/src/wearable-circle/view/layout_static_ip.c @@ -117,7 +117,9 @@ static void _append_menu(layout_static_ip_object *self, static_ip_menu_type type case STATIC_IP_ITEM_DNS2: itc = create_genlist_itc("2text", self->menu_cb[type].text_get, NULL, NULL, NULL); break; - + case STATIC_IP_ITEM_EMPTY: + itc = create_genlist_itc("padding", NULL, NULL, NULL, NULL); + break; default: return; } @@ -125,6 +127,9 @@ static void _append_menu(layout_static_ip_object *self, static_ip_menu_type type if (type == STATIC_IP_ITEM_TITLE) { self->menu_item[type] = elm_genlist_item_append(self->menu_list, itc, self->menu_cb[type].data, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + } else if (type == STATIC_IP_ITEM_EMPTY) { + self->menu_item[type] = elm_genlist_item_append(self->menu_list, itc, + NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); } else { self->menu_item[type] = elm_genlist_item_append(self->menu_list, itc, self->menu_cb[type].data, NULL, ELM_GENLIST_ITEM_NONE, @@ -175,6 +180,7 @@ gboolean layout_static_ip_create(layout_static_ip_object *self) _append_menu(self, STATIC_IP_ITEM_GATEWAY); _append_menu(self, STATIC_IP_ITEM_DNS1); _append_menu(self, STATIC_IP_ITEM_DNS2); + _append_menu(self, STATIC_IP_ITEM_EMPTY); elm_object_part_content_set(self->layout, "elm.swallow.content", self->menu_list); -- 2.7.4