From 82f926b550b6c701d50b2b175175c0b36581db2e Mon Sep 17 00:00:00 2001 From: Jin Yoon Date: Wed, 24 Jul 2013 11:21:21 +0900 Subject: [PATCH] Popup : change buttons(yes/no -> cancel/ok), styles, blocks --- data/org.tizen.menu-screen.xml.in | 2 +- packaging/org.tizen.menu-screen.spec | 2 +- src/popup.c | 16 ++++++---------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/data/org.tizen.menu-screen.xml.in b/data/org.tizen.menu-screen.xml.in index a35b0ef..8902091 100755 --- a/data/org.tizen.menu-screen.xml.in +++ b/data/org.tizen.menu-screen.xml.in @@ -1,5 +1,5 @@ - + Jin Yoon Youngjoo Park diff --git a/packaging/org.tizen.menu-screen.spec b/packaging/org.tizen.menu-screen.spec index 8fce5e5..28d1766 100644 --- a/packaging/org.tizen.menu-screen.spec +++ b/packaging/org.tizen.menu-screen.spec @@ -16,7 +16,7 @@ Name: org.tizen.menu-screen Summary: An utility library of the menu screen -Version: 1.2.2 +Version: 1.2.3 Release: 1.1 Group: TO_BE/FILLED_IN License: Flora Software License diff --git a/src/popup.c b/src/popup.c index b640525..b963a5e 100644 --- a/src/popup.c +++ b/src/popup.c @@ -67,7 +67,6 @@ static void _response_cb(void *data, Evas_Object *obj, void *event_info) popup_info.popup = NULL; evas_object_del(evas_object_data_del(popup, "button")); - evas_object_smart_callback_del(popup, "block,clicked", _response_cb); evas_object_del(popup); } @@ -85,8 +84,6 @@ HAPI Evas_Object *popup_create_confirm(Evas_Object *parent, const char *warning) popup = elm_popup_add(parent); retv_if(NULL == popup, NULL); - evas_object_smart_callback_add(popup, "block,clicked", _response_cb, popup); - btn = elm_button_add(popup); if (NULL == btn) { evas_object_del(popup); @@ -124,7 +121,6 @@ static void _uninstall_no_cb(void *data, Evas_Object *obj, void *event_info) evas_object_del(evas_object_data_del(popup, "button1")); evas_object_del(evas_object_data_del(popup, "button2")); evas_object_data_del(popup, "item"); - evas_object_smart_callback_del(popup, "block,clicked", _uninstall_no_cb); evas_object_del(popup); } @@ -143,7 +139,6 @@ static void _uninstall_yes_cb(void *data, Evas_Object *obj, void *event_info) evas_object_del(evas_object_data_del(popup, "button1")); evas_object_del(evas_object_data_del(popup, "button2")); - evas_object_smart_callback_del(popup, "block,clicked", _uninstall_no_cb); evas_object_del(popup); bool is_shortcut = false; @@ -174,27 +169,28 @@ HAPI Evas_Object *popup_create_uninstall(Evas_Object *parent, Evas_Object *item) retv_if(NULL == popup, NULL); evas_object_data_set(popup, "item", item); - evas_object_smart_callback_add(popup, "block,clicked", _uninstall_no_cb, popup); btn1 = elm_button_add(popup); if (NULL == btn1) { evas_object_del(popup); return NULL; } - elm_object_text_set(btn1, D_("IDS_COM_SK_YES")); + elm_object_style_set(btn1, "popup_button/default"); + elm_object_text_set(btn1, D_("IDS_COM_SK_CANCEL")); evas_object_data_set(popup, "button1", btn1); elm_object_part_content_set(popup, "button1", btn1); - evas_object_smart_callback_add(btn1, "clicked", _uninstall_yes_cb, popup); + evas_object_smart_callback_add(btn1, "clicked", _uninstall_no_cb, popup); btn2 = elm_button_add(popup); if (NULL == btn2) { evas_object_del(popup); return NULL; } - elm_object_text_set(btn2, D_("IDS_COM_SK_NO")); + elm_object_style_set(btn2, "popup_button/default"); + elm_object_text_set(btn2, D_("IDS_COM_SK_OK")); evas_object_data_set(popup, "button2", btn2); elm_object_part_content_set(popup, "button2", btn2); - evas_object_smart_callback_add(btn2, "clicked", _uninstall_no_cb, popup); + evas_object_smart_callback_add(btn2, "clicked", _uninstall_yes_cb, popup); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_data_set(popup, "func_destroy_popup", _uninstall_no_cb); -- 2.34.1