From 90c21c67bc927eaf6c94745d4b4e20e026f32280 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Fri, 16 Dec 2016 15:02:56 +0900 Subject: [PATCH] Remove unused layout style to show device icon Change-Id: I840e07011ff6ff93fabc2f5d975a6102d2b532f8 Signed-off-by: Seonah Moon --- include/mobile_hotspot.h | 1 + packaging/ug-setting-mobileap-efl.spec | 2 +- src/mh_connected_client.c | 39 ++++++++-------------------------- 3 files changed, 11 insertions(+), 31 deletions(-) diff --git a/include/mobile_hotspot.h b/include/mobile_hotspot.h index 6fea7d6..61adffd 100755 --- a/include/mobile_hotspot.h +++ b/include/mobile_hotspot.h @@ -88,6 +88,7 @@ extern "C" { #define BT_ICON "A01-5_device_bluetooth.png" #define USB_ICON "A01-5_device_USB_icon.png" +#define DEFAULT_ICON_SIZE 40 #define DEVICE_NAME_LENGTH_MAX 32 #define WIFI_PASSPHRASE_LENGTH_MIN 8 #define WIFI_PASSPHRASE_LENGTH_MAX 63 diff --git a/packaging/ug-setting-mobileap-efl.spec b/packaging/ug-setting-mobileap-efl.spec index de6bbf9..afc61ee 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.157 +Version: 1.0.158 Release: 1 Group: App/Network License: Flora-1.1 diff --git a/src/mh_connected_client.c b/src/mh_connected_client.c index fa32ed1..518359a 100755 --- a/src/mh_connected_client.c +++ b/src/mh_connected_client.c @@ -165,64 +165,43 @@ static char *__gl_get_dev_label(void *data, Evas_Object *obj, const char *part) static Evas_Object *__gl_get_dev_wifi_icon(void *data, Evas_Object *obj, const char *part) { - Evas_Object *ly = NULL; Evas_Object *icon = NULL; if (!strcmp("elm.swallow.icon", part)) { - ly = elm_layout_add(obj); - elm_layout_theme_set(ly, "layout", "list/C/type.1", "default"); - icon = elm_icon_add(obj); elm_image_file_set(icon, EDJDIR"/"TETHERING_IMAGES_EDJ, WIFI_ICON); - evas_object_color_set(icon, 2, 61, 132, 255); - evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_layout_content_set(ly, "elm.swallow.content", icon); + evas_object_color_set(icon, 2, 61, 132, 204); + evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DEFAULT_ICON_SIZE), ELM_SCALE_SIZE(DEFAULT_ICON_SIZE)); } - - return ly; + return icon; } static Evas_Object *__gl_get_dev_usb_icon(void *data, Evas_Object *obj, const char *part) { - Evas_Object *ly = NULL; Evas_Object *icon = NULL; if (!strcmp("elm.swallow.icon", part)) { - ly = elm_layout_add(obj); - elm_layout_theme_set(ly, "layout", "list/C/type.1", "default"); - icon = elm_icon_add(obj); elm_image_file_set(icon, EDJDIR"/"TETHERING_IMAGES_EDJ, USB_ICON); - evas_object_color_set(icon, 2, 61, 132, 255); - evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_layout_content_set(ly, "elm.swallow.content", icon); + evas_object_color_set(icon, 2, 61, 132, 204); + evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DEFAULT_ICON_SIZE), ELM_SCALE_SIZE(DEFAULT_ICON_SIZE)); } - - return ly; + return icon; } static Evas_Object *__gl_get_dev_bt_icon(void *data, Evas_Object *obj, const char *part) { - Evas_Object *ly = NULL; Evas_Object *icon = NULL; if (!strcmp("elm.swallow.icon", part)) { - ly = elm_layout_add(obj); - elm_layout_theme_set(ly, "layout", "list/C/type.1", "default"); - icon = elm_image_add(obj); elm_image_file_set(icon, EDJDIR"/"TETHERING_IMAGES_EDJ, BT_ICON); - evas_object_color_set(icon, 2, 61, 132, 255); - evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_layout_content_set(ly, "elm.swallow.content", icon); + evas_object_color_set(icon, 2, 61, 132, 204); + evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DEFAULT_ICON_SIZE), ELM_SCALE_SIZE(DEFAULT_ICON_SIZE)); } - - return ly; + return icon; } static void __set_genlist_itc(mh_appdata_t *ad) -- 2.7.4