Implement hardware key event #3

Change-Id: I1fd476c149d8fa669db6eaf9ed3276e2cdeb2c21
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index a1a323a..93f919a 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,6 +1,6 @@
 Name:       wifi-efl-ug
 Summary:    Wi-Fi UI Gadget
-Version:    0.5.2_29
+Version:    0.5.2_30
 Release:    1
 Group:      App/Network
 License:    Flora License

diff --git a/sources/libraries/Common/common_utils.c b/sources/libraries/Common/common_utils.c
index 6a81ae0..a22da81 100644 (file)
--- a/sources/libraries/Common/common_utils.c
+++ b/sources/libraries/Common/common_utils.c
@@ -328,8 +328,6 @@ Evas_Object *common_utils_show_info_popup(Evas_Object *parent, popup_btn_info_t
        __COMMON_FUNC_ENTER__;
        Evas_Object *popup = elm_popup_add(parent);
 
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
-
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        if (popup_data->title_txt)
                elm_object_part_text_set(popup, "title,text", popup_data->title_txt);
@@ -353,8 +351,10 @@ Evas_Object *common_utils_show_info_popup(Evas_Object *parent, popup_btn_info_t
                evas_object_show(popup);
                if (popup_data->btn2_cb) {
                        evas_object_smart_callback_add(btn_2, "clicked", popup_data->btn2_cb, popup_data->btn2_data);
+                       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, popup_data->btn2_cb, popup_data->btn2_data);
                } else {        // set the default callback
                        evas_object_smart_callback_add(btn_2, "clicked", __common_utils_del_popup, popup);
+                       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
                }
        }
 

diff --git a/sources/ui-gadget/viewers-layout/view_detail.c b/sources/ui-gadget/viewers-layout/view_detail.c
index d237043..2f5dd92 100644 (file)
--- a/sources/ui-gadget/viewers-layout/view_detail.c
+++ b/sources/ui-gadget/viewers-layout/view_detail.c
@@ -329,11 +329,21 @@ void view_detail(wifi_device_info_t *device_info, Evas_Object *win_main)
 
        if (favorite) {
                /* Toolbar Forget button */
+#ifdef SK_BACK_SUPPORT
                Evas_Object* forget_button = elm_button_add(navi_frame);
                elm_object_style_set(forget_button, "naviframe/toolbar/default");
                elm_object_text_set(forget_button, sc(PACKAGE, I18N_TYPE_Forget));
                evas_object_smart_callback_add(forget_button, "clicked", forget_sk_cb, _detail_data);
                elm_object_item_part_content_set(navi_it, "toolbar_button1", forget_button);
+#else
+               Evas_Object *toolbar = elm_toolbar_add(navi_frame);
+               elm_object_style_set(toolbar, "default");
+               elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
+               elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
+               elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_NONE);
+               elm_toolbar_item_append(toolbar, NULL, sc(PACKAGE, I18N_TYPE_Forget), forget_sk_cb, _detail_data);
+               elm_object_item_part_content_set(navi_it, "toolbar", toolbar);
+#endif
        }
 
        wifi_security_type_e type = WIFI_SECURITY_TYPE_NONE;