apply SKeyDownListener and SKeyUpListener in application-common

Change-Id: If84188234ed1929d7a89eb57dbf3db74f41ce7f4
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/include/view/allsource_view.h b/include/view/allsource_view.h
index 5759c16..f9d6c3a 100644 (file)
--- a/include/view/allsource_view.h
+++ b/include/view/allsource_view.h
@@ -63,7 +63,7 @@ public:
        virtual void Destroy(void);
 
 public:
-       virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev);
+       virtual void OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Down *ev);
        virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev);
        virtual void OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item);
 };

diff --git a/include/view/menu_view.h b/include/view/menu_view.h
index 47f35d6..2ec140f 100644 (file)
--- a/include/view/menu_view.h
+++ b/include/view/menu_view.h
@@ -53,7 +53,7 @@ public:
        virtual void Destroy(void);
 
 public:
-       void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev);
+       void OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Down *ev);
        void OnMouseDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Down *ev);
        void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev);
        void OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item);

diff --git a/include/view/plugged_layout.h b/include/view/plugged_layout.h
index 8bf25d3..cb5639b 100644 (file)
--- a/include/view/plugged_layout.h
+++ b/include/view/plugged_layout.h
@@ -18,7 +18,7 @@
 #define __PLUGGED_LAYOUT_H__
 
 class CPluggedLayout : public CBaseLayout, CListenerMgr,
-       IKeyDownListener, IMouseMoveListener,
+       ISKeyDownListener, IMouseMoveListener,
        IRealizedListener, IUnrealizedListener, IFocusedListener {
 
 private:
@@ -43,7 +43,7 @@ private:
 
 public:
        CPluggedLayout(const char *pLayoutId) : CBaseLayout(pLayoutId),
-               IKeyDownListener(this), IMouseMoveListener(this),
+               ISKeyDownListener(this), IMouseMoveListener(this),
                IRealizedListener(this), IUnrealizedListener(this),
                IFocusedListener(this), m(0) {}
 
@@ -56,7 +56,7 @@ public:
        void Update(void *data, enum update_ui type);
 
 public:
-       void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev);
+       void OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Down *ev);
        void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev);
        void OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item);
        void OnUnrealized(int id, Evas_Object *obj, Elm_Object_Item *item);

diff --git a/src/view/allsource_view.cpp b/src/view/allsource_view.cpp
index 85c0a7c..778ac1f 100644 (file)
--- a/src/view/allsource_view.cpp
+++ b/src/view/allsource_view.cpp
@@ -247,16 +247,20 @@ void CAllSourceView::t_OnShow(void)
        }
 }
 
-void CAllSourceView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev)
+void CAllSourceView::OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Down *ev)
 {
        switch (id) {
        case ALL_PLUG_BTN:
-               if (!strcmp(ev->keyname, KEY_BACK)
-                       || !strcmp(ev->keyname, KEY_BACK_REMOTE))
+               switch (ev->skey) {
+               case SKEY_BACK:
                        app_efl_exit();
-               else if (!strcmp(ev->keyname, KEY_ENTER)
-                       || !strcmp(ev->keyname, KEY_ENTER_REMOTE))
+                       break;
+               case SKEY_ENTER:
                        m->pPluggedLayout->Focus();
+                       break;
+               default:
+                       break;
+               }
                break;
        default:
                break;

diff --git a/src/view/menu_view.cpp b/src/view/menu_view.cpp
index fadb81c..52eefae 100644 (file)
--- a/src/view/menu_view.cpp
+++ b/src/view/menu_view.cpp
@@ -339,37 +339,36 @@ void CMenuView::t_OnResume(void)
        elm_object_focus_set(m->focus_btn, EINA_TRUE);
 }
 
-void CMenuView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev)
+void CMenuView::OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Down *ev)
 {
        switch (id) {
        case MENU_BASE:
-               if (!ev->keyname)
-                       return;
-
-               if (!strcmp(ev->keyname, KEY_BACK)
-                       || !strcmp(ev->keyname, KEY_BACK_REMOTE))
+               switch (ev->skey) {
+               case SKEY_BACK:
                        m->vmgr->PopView();
-
+                       break;
+               default:
+                       break;
+               }
                break;
        case MENU_SELECT_BTN:
-               if (!ev->keyname)
-                       return;
-
-               if (!strcmp(ev->keyname, KEY_ENTER)
-                       || !strcmp(ev->keyname, KEY_ENTER_REMOTE))
+               switch (ev->skey) {
+               case SKEY_ENTER:
                        m->node->SwitchTo();
-
+                       break;
+               default:
+                       break;
+               }
                break;
        case MENU_REMOVE_BTN:
-               if (!ev->keyname)
-                       return;
-
-               if (!strcmp(ev->keyname, KEY_ENTER)
-                       || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+               switch (ev->skey) {
+               case SKEY_ENTER:
                        /* TODO call usb remove */
                        m->vmgr->PopView();
+                       break;
+               default:
+                       break;
                }
-
                break;
        default:
                break;

diff --git a/src/view/plugged_layout.cpp b/src/view/plugged_layout.cpp
index 191aa35..1a61790 100644 (file)
--- a/src/view/plugged_layout.cpp
+++ b/src/view/plugged_layout.cpp
@@ -279,7 +279,7 @@ void CPluggedLayout::Update(void *data, enum update_ui type)
        }
 }
 
-void CPluggedLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev)
+void CPluggedLayout::OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Down *ev)
 {
        switch (id) {
        case PLUGGED_GRID:
@@ -289,12 +289,17 @@ void CPluggedLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key
                if (!si)
                        return;
 
-               if (!strcmp(ev->keyname, KEY_MENU)
-                       || !strcmp(ev->keyname, KEY_MENU_REMOTE))
+               switch (ev->skey) {
+               case SKEY_MENU:
                        m->vmgr->PushView(MENU_VIEW, si);
-               else if (!strcmp(ev->keyname, KEY_BACK)
-                       || !strcmp(ev->keyname, KEY_BACK_REMOTE))
+                       break;
+               case SKEY_BACK:
                        m->sigCb->cb(m->sigCb->cookie, E_RETURN);
+                       break;
+               default:
+                       break;
+               }
+
                break;
        default:
                break;