From 9a4875ac3a8ee1187ed4023e83b3a8d153b527be Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Wed, 21 Aug 2019 18:12:16 +0900 Subject: [PATCH] Implement OOBE view #2 - edc: fix smart callback issue - disable unused buttons (scan, details) Change-Id: Iffe0f98a843e9fee03e395247a0e3df691b7f2ce --- sources/ui-gadget/edcs/oobe_buttons.edc | 67 ++++++++-------------- sources/ui-gadget/viewers-layout/viewer_manager.c | 6 +- .../ui-gadget/viewers-layout/wifi_viewer_list.c | 3 +- 3 files changed, 29 insertions(+), 47 deletions(-) diff --git a/sources/ui-gadget/edcs/oobe_buttons.edc b/sources/ui-gadget/edcs/oobe_buttons.edc index 68fb25e..1b02a3b 100755 --- a/sources/ui-gadget/edcs/oobe_buttons.edc +++ b/sources/ui-gadget/edcs/oobe_buttons.edc @@ -359,24 +359,10 @@ collections { group { "elm/check/event/default"; inherit_only: 1; parts { - image { "bg" - desc { "default"; - } - } rect { "event"; - mouse; - repeat_events: 1; desc { "default"; color: COLOR_TRANSPARENT; vis; - rel1 { - to: "bg"; - relative: 0.0 0.0; - } - rel2 { - to: "bg"; - relative: 1.0 1.0; - } } desc { "disabled"; inherit: "default"; @@ -391,7 +377,11 @@ collections { program { "clicked"; signal: "mouse,clicked,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,click" ""; + sequence { + action: SIGNAL_EMIT "elm,action,click" ""; + + action: SIGNAL_EMIT "elm,action,check,toggle" ""; + } after: "on_clicked"; } program { "pressed"; @@ -409,23 +399,11 @@ collections { program { "set_check"; signal: "elm,state,check,on"; source: "elm"; - sequence { - action: STATE_SET "checked"; - target: "event"; - - action: SIGNAL_EMIT "elm,state,checked" ""; - } after: "on_set_check"; } program { "unset_check"; signal: "elm,state,check,off"; source: "elm"; - sequence { - action: STATE_SET "default"; - target: "event"; - - action: SIGNAL_EMIT "elm,state,unchecked" ""; - } after: "on_unset_check"; } program { "disabled"; @@ -438,18 +416,19 @@ collections { source: "elm"; after: "on_enabled"; } - program { "check_setter"; - filter: "event" "default"; - signal: "elm,action,click"; - source: ""; - after: "set_check"; - } - program { "check_unsetter"; - filter: "event" "checked"; - signal: "elm,action,click"; - source: ""; - after: "unset_check"; + } + } + + group { "elm/check/base/template"; + inherit: "elm/check/event/default"; + nomouse; + parts { + spacer { "base"; + desc { "default"; + } } + } + programs { program { name: "on_set_check"; //Can be overriden in inheriting class } @@ -472,10 +451,12 @@ collections { //Can be overriden in inheriting class } } - } // base checkbox + } + // base checkbox group { "elm/check/base/wifiug"; - inherit: "elm/check/event/default"; + nomouse; + inherit: "elm/check/base/template"; inherit_only: 1; images { @@ -511,6 +492,7 @@ collections { } group { + nomouse; name: "elm/check/base/onoff"; inherit: "elm/check/base/wifiug"; @@ -548,7 +530,6 @@ collections { } } text { "elm.text" - insert_after: "dot"; desc { "default"; color: ON_OFF_BUTTON_OFF_TEXT_COLOR; text { @@ -583,7 +564,6 @@ collections { } } image { "dot"; - insert_after: "event"; desc { "default"; image.normal: ON_OFF_DOT_BG; rel1 { to: "bg"; relative: 12/70 11/32; } @@ -641,7 +621,8 @@ collections { } group { "elm/check/base/oobe-casual"; - inherit: "elm/check/event/default"; + inherit: "elm/check/base/template"; + nomouse; images { image: CHECKBOX_CHECKED_BG COMP; diff --git a/sources/ui-gadget/viewers-layout/viewer_manager.c b/sources/ui-gadget/viewers-layout/viewer_manager.c index a215d8b..53e9143 100755 --- a/sources/ui-gadget/viewers-layout/viewer_manager.c +++ b/sources/ui-gadget/viewers-layout/viewer_manager.c @@ -1487,7 +1487,9 @@ Evas_Object *viewer_manager_naviframe_power_item_get(void) int viewer_manager_create_scan_btn(void) { __COMMON_FUNC_ENTER__; - if (ug_app_state->ug_type == UG_VIEW_SETUP_WIZARD || manager_object->scan_button) { + if (ug_app_state->ug_type == UG_VIEW_SETUP_WIZARD + || ug_app_state->ug_type == UG_VIEW_OOBE + || manager_object->scan_button) { __COMMON_FUNC_EXIT__; return 0; } @@ -1502,7 +1504,7 @@ int viewer_manager_create_scan_btn(void) "IDS_WIFI_BUTTON_SCAN"); evas_object_smart_callback_add(btn, "clicked", __refresh_scan_callback, NULL); - /* Set button into "toolbar" swallow part */ + /* Set button into "toolbar" swallow part */ elm_object_item_part_content_set(manager_object->navi_it, "toolbar", btn); manager_object->scan_button = btn; evas_object_show(manager_object->scan_button); diff --git a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c index 77cc84b..4f3b7fc 100755 --- a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c +++ b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c @@ -155,8 +155,7 @@ static Evas_Object *_gl_listview_content_get(void *data, Evas_Object *obj, const evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_pulse(icon, TRUE); evas_object_propagate_events_set(icon, EINA_FALSE); - - } else { + } else if (wifi_get_ug_type() != UG_VIEW_OOBE) { btn = elm_button_add(obj); elm_object_style_set(btn, "circle_custom"); icon = elm_image_add(btn); -- 2.7.4