Changed popup button from positive/negative to negative/positive

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

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index db1cf79..1fa8501 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_37
+Version:    0.5.2_38
 Release:    1
 Group:      App/Network
 License:    Flora License

diff --git a/sources/libraries/Common/common_eap_connect.c b/sources/libraries/Common/common_eap_connect.c
index c5396e4..3417b15 100644 (file)
--- a/sources/libraries/Common/common_eap_connect.c
+++ b/sources/libraries/Common/common_eap_connect.c
@@ -980,8 +980,6 @@ static void __common_eap_connect_cleanup(eap_connect_data_t *eap_data)
        evas_object_del(radio_main);
        radio_main = NULL;
 
-       ea_object_event_callback_del(eap_data->navi_frame, EA_CALLBACK_BACK, ea_naviframe_back_cb);
-
        if (eap_data->navi_frame) {
                evas_object_smart_callback_del(eap_data->navi_frame, "title,clicked",
                                __eap_view_title_clicked_cb);
@@ -999,7 +997,9 @@ static void __common_eap_connect_destroy(void *data,  Evas_Object *obj, void *ev
 {
        __COMMON_FUNC_ENTER__;
 
-       __common_eap_connect_cleanup((eap_connect_data_t *)data);
+       eap_connect_data_t *eap_data = (eap_connect_data_t *)data;
+       ea_object_event_callback_del(eap_data->navi_frame, EA_CALLBACK_BACK, ea_naviframe_back_cb);
+       __common_eap_connect_cleanup(eap_data);
 
        __COMMON_FUNC_EXIT__;
 }
@@ -1290,16 +1290,16 @@ eap_connect_data_t *create_eap_popup(Evas_Object *win_main,
        evas_object_size_hint_align_set(popup, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
        btn = elm_button_add(popup);
-       elm_object_text_set(btn, sc(pkg_name, I18N_TYPE_Connect));
+       elm_object_text_set(btn, sc(pkg_name, I18N_TYPE_Cancel));
        elm_object_part_content_set(popup, "button1", btn);
        evas_object_smart_callback_add(btn, "clicked",
-                       __common_eap_connect_done_cb, eap_data);
+                       __common_eap_connect_destroy, eap_data);
 
        btn = elm_button_add(popup);
-       elm_object_text_set(btn, sc(pkg_name, I18N_TYPE_Cancel));
+       elm_object_text_set(btn, sc(pkg_name, I18N_TYPE_Connect));
        elm_object_part_content_set(popup, "button2", btn);
        evas_object_smart_callback_add(btn, "clicked",
-                       __common_eap_connect_destroy, eap_data);
+                       __common_eap_connect_done_cb, eap_data);
 
        /* Create and add a box into the layout. */
        box = elm_box_add(popup);

diff --git a/sources/libraries/Common/common_pswd_popup.c b/sources/libraries/Common/common_pswd_popup.c
index 5c41b50..178b655 100644 (file)
--- a/sources/libraries/Common/common_pswd_popup.c
+++ b/sources/libraries/Common/common_pswd_popup.c
@@ -234,12 +234,12 @@ pswd_popup_t *create_passwd_popup(Evas_Object *win_main,
        memset(&popup_btn_data, 0, sizeof(popup_btn_data));
 
        popup_btn_data.title_txt = popup_info->title;
-       popup_btn_data.btn1_cb = popup_info->ok_cb;
-       popup_btn_data.btn1_data = popup_info->cb_data;
-       popup_btn_data.btn2_cb = popup_info->cancel_cb;
+       popup_btn_data.btn2_cb = popup_info->ok_cb;
        popup_btn_data.btn2_data = popup_info->cb_data;
-       popup_btn_data.btn1_txt = sc(pkg_name, I18N_TYPE_Ok);
-       popup_btn_data.btn2_txt = sc(pkg_name, I18N_TYPE_Cancel);
+       popup_btn_data.btn1_cb = popup_info->cancel_cb;
+       popup_btn_data.btn1_data = popup_info->cb_data;
+       popup_btn_data.btn2_txt = sc(pkg_name, I18N_TYPE_Ok);
+       popup_btn_data.btn1_txt = sc(pkg_name, I18N_TYPE_Cancel);
        Evas_Object *passpopup = common_utils_show_info_popup(win_main, &popup_btn_data);
 
        Evas_Object *eo = elm_layout_edje_get(passpopup);

diff --git a/sources/libraries/Common/common_utils.c b/sources/libraries/Common/common_utils.c
index a22da81..5fcdef9 100644 (file)
--- a/sources/libraries/Common/common_utils.c
+++ b/sources/libraries/Common/common_utils.c
@@ -339,8 +339,10 @@ Evas_Object *common_utils_show_info_popup(Evas_Object *parent, popup_btn_info_t
                elm_object_part_content_set(popup, "button1", btn_1);
                if (popup_data->btn1_cb) {
                        evas_object_smart_callback_add(btn_1, "clicked", popup_data->btn1_cb, popup_data->btn1_data);
+                       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, popup_data->btn1_cb, popup_data->btn1_data);
                } else {        // set the default callback
                        evas_object_smart_callback_add(btn_1, "clicked", __common_utils_del_popup, popup);
+                       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
                }
        }
        if (popup_data->btn2_txt) {
@@ -351,10 +353,8 @@ 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 a6db6e4..c22f314 100644 (file)
--- a/sources/ui-gadget/viewers-layout/view_detail.c
+++ b/sources/ui-gadget/viewers-layout/view_detail.c
@@ -196,12 +196,12 @@ static void forget_sk_cb(void *data, Evas_Object *obj, void *event_info)
                memset(&popup_data, 0, sizeof(popup_data));
 
                popup_data.info_txt = g_strdup(sc(PACKAGE, I18N_TYPE_Autonomous_connection_to_s_will_be_turned_off_Continue));
-               popup_data.btn1_cb = ok_cb;
-               popup_data.btn1_txt = sc(PACKAGE, I18N_TYPE_Ok);
-               popup_data.btn1_data = _detail_data;
-               popup_data.btn2_cb = cancel_cb;
-               popup_data.btn2_txt = sc(PACKAGE, I18N_TYPE_Cancel);
+               popup_data.btn2_cb = ok_cb;
+               popup_data.btn2_txt = sc(PACKAGE, I18N_TYPE_Ok);
                popup_data.btn2_data = _detail_data;
+               popup_data.btn1_cb = cancel_cb;
+               popup_data.btn1_txt = sc(PACKAGE, I18N_TYPE_Cancel);
+               popup_data.btn1_data = _detail_data;
                _detail_data->forget_confirm_popup = common_utils_show_info_popup(_detail_data->win, &popup_data);
 
                evas_object_show(_detail_data->forget_confirm_popup);

diff --git a/sources/ui-gadget/viewers-layout/view_ime_hidden.c b/sources/ui-gadget/viewers-layout/view_ime_hidden.c
index fc44d34..83c90e1 100644 (file)
--- a/sources/ui-gadget/viewers-layout/view_ime_hidden.c
+++ b/sources/ui-gadget/viewers-layout/view_ime_hidden.c
@@ -82,12 +82,12 @@ hiddep_ap_popup_data_t *view_hidden_ap_popup_create(Evas_Object *win_main, const
 
        memset(&popup_btn_data, 0, sizeof(popup_btn_data));
        popup_btn_data.title_txt = sc(str_pkg_name,I18N_TYPE_Find_Hidden_Network);
-       popup_btn_data.btn1_cb = view_hidden_ap_popup_ok_cb;
-       popup_btn_data.btn1_data = hidden_ap_popup_data;
-       popup_btn_data.btn2_cb = view_hidden_ap_popup_cancel_cb;
+       popup_btn_data.btn2_cb = view_hidden_ap_popup_ok_cb;
        popup_btn_data.btn2_data = hidden_ap_popup_data;
-       popup_btn_data.btn1_txt = sc(str_pkg_name, I18N_TYPE_Ok);
-       popup_btn_data.btn2_txt = sc(str_pkg_name, I18N_TYPE_Cancel);
+       popup_btn_data.btn1_cb = view_hidden_ap_popup_cancel_cb;
+       popup_btn_data.btn1_data = hidden_ap_popup_data;
+       popup_btn_data.btn2_txt = sc(str_pkg_name, I18N_TYPE_Ok);
+       popup_btn_data.btn1_txt = sc(str_pkg_name, I18N_TYPE_Cancel);
        Evas_Object *passpopup = common_utils_show_info_popup(win_main, &popup_btn_data);
 
        Evas_Object *box = elm_box_add(passpopup);