modify key values as key_define

Change-Id: Ib25c5b137295adc2b2f868ddf03b6bed729ea32b
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/src/view/view_action_menu.c b/src/view/view_action_menu.c
index 0a47f80..e7216fe 100644 (file)
--- a/src/view/view_action_menu.c
+++ b/src/view/view_action_menu.c
@@ -163,7 +163,7 @@ static void _popup_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
        priv = data;
 
        if (!strcmp(ev->keyname, KEY_BACK)
-                       || !strcmp(ev->keyname, KEY_BACK_REMOTE))
+                       || !strcmp(ev->keyname, KEY_ESC))
                evas_object_del(priv->popup);
 }
 
@@ -252,7 +252,7 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
        priv = data;
 
        if (!strcmp(ev->keyname, KEY_BACK)
-                       || !strcmp(ev->keyname, KEY_BACK_REMOTE))
+                       || !strcmp(ev->keyname, KEY_ESC))
                elm_object_signal_emit(priv->base, SIG_HIDE, SIG_SOURCE_EDC);
 }
 

diff --git a/src/view/view_base.c b/src/view/view_base.c
index a126200..8213f87 100644 (file)
--- a/src/view/view_base.c
+++ b/src/view/view_base.c
@@ -164,7 +164,7 @@ static void _menu_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
                elm_object_focus_set(priv->grid, EINA_TRUE);
        } else if (!strcmp(ev->keyname, KEY_BACK)
-                       || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                       || !strcmp(ev->keyname, KEY_ESC)) {
                ui_app_exit();
        }
 }
@@ -212,10 +212,9 @@ static void _option_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
        priv = data;
 
        if (!strcmp(ev->keyname, KEY_BACK)
-                       || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                       || !strcmp(ev->keyname, KEY_ESC)) {
                _destroy_sort_ctxpopup(priv);
-       } else if (!strcmp(ev->keyname, KEY_ENTER)
-                       || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+       } else if (!strcmp(ev->keyname, KEY_ENTER)) {
                _sort_option_selected(priv, id, obj);
                priv->focused_item = elm_gengrid_first_item_get(priv->grid);
        }
@@ -276,7 +275,7 @@ static void _sort_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
        priv = data;
 
        if (!strcmp(ev->keyname, KEY_BACK)
-                       || !strcmp(ev->keyname, KEY_BACK_REMOTE)
+                       || !strcmp(ev->keyname, KEY_ESC)
                        || !strcmp(ev->keyname, KEY_UP)) {
                ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
 
@@ -285,8 +284,7 @@ static void _sort_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                                        EINA_TRUE);
                else
                        elm_object_focus_set(priv->focused_menu, EINA_TRUE);
-       } else if (!strcmp(ev->keyname, KEY_ENTER)
-                       || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+       } else if (!strcmp(ev->keyname, KEY_ENTER)) {
                if (!_draw_sort_option(priv))
                        _ERR("Draw sort ctxpopup failed.");
 
@@ -452,10 +450,10 @@ static void _grid_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
        priv = data;
 
        if (!strcmp(ev->keyname, KEY_BACK)
-                       || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                       || !strcmp(ev->keyname, KEY_ESC)) {
                elm_object_focus_set(priv->focused_menu, EINA_TRUE);
        } else if (!strcmp(ev->keyname, KEY_MENU)
-                       || !strcmp(ev->keyname, KEY_MENU_REMOTE)) {
+                       || !strcmp(ev->keyname, KEY_CONTEXT_MENU)) {
                adata = elm_object_item_data_get(priv->focused_item);
                if (!adata)
                        return;