fix keycodes

Change-Id: I6afbac9c3b62356db156dbabd77c388bcc76900d

diff --git a/inc/FUiKeyTypes.h b/inc/FUiKeyTypes.h
index e29f74c..0bfccd9 100644 (file)
--- a/inc/FUiKeyTypes.h
+++ b/inc/FUiKeyTypes.h
@@ -215,7 +215,7 @@ enum KeyCode
        KEY_SOFT_KEYBOARD,              /**< The soft keyboard key @b Since: @b 2.2 */
        KEY_SEARCH,                             /**< The search key @b Since: @b 2.2 */
        KEY_VOICE,                                      /**< The voice key @b Since: @b 2.2 */
-       KEY_QUICKPANEL,                 /**< The quickpanel key @b Since: @b 2.2 */
+       KEY_QUICK_PANEL,                        /**< The quick panel key @b Since: @b 2.2 */
        KEY_CLIPBOARD,                          /**< The clipboard key @b Since: @b 2.2 */
        KEY_HARDWARE_MAX = INT_MAX
 };

diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp
index ff17881..0d30b1a 100644 (file)
--- a/src/ui/FUi_EflUiEventManager.cpp
+++ b/src/ui/FUi_EflUiEventManager.cpp
@@ -48,9 +48,6 @@
 #if defined KEY_VOICE
 #undef KEY_VOICE
 #endif
-#if defined KEY_QUICKPANEL
-#undef KEY_QUICKPANEL
-#endif
 #include <X11/Xlib.h>
 #include <Evas.h>
 #include <FBaseColIEnumeratorT.h>
@@ -284,7 +281,7 @@ const _EvasConvertKeys keyTable[] =
        { _KEY_SOFT_KEYBOARD, "XF86MenuKB" },
        { _KEY_SEARCH, "XF86Search" },
        { _KEY_VOICE, "XF86Launch2" },
-       { _KEY_QUICKPANEL, "XF86Tools" }
+       { _KEY_QUICK_PANEL, "XF86Tools" }
        //{ _KEY_SIDE_UP, "XF86AudioRaiseVolume" },
        //{ _KEY_SIDE_DOWN, "XF86AudioLowerVolume" },
        //{ _KEY_POWER_HOLD, "XF86PowerOff" },

diff --git a/src/ui/FUi_SystemUtilImpl.cpp b/src/ui/FUi_SystemUtilImpl.cpp
index 321fd15..2aab255 100644 (file)
--- a/src/ui/FUi_SystemUtilImpl.cpp
+++ b/src/ui/FUi_SystemUtilImpl.cpp
@@ -47,9 +47,6 @@
 #if defined KEY_VOICE
 #undef KEY_VOICE
 #endif
-#if defined KEY_QUICKPANEL
-#undef KEY_QUICKPANEL
-#endif
 #include <unique_ptr.h>
 #include <Ecore_X.h>
 #include <FBaseSysLog.h>
@@ -196,7 +193,7 @@ const ConvertKeys KeyCodeMap[] = {
        { _KEY_SOFT_KEYBOARD, "XF86MenuKB" },
        { _KEY_SEARCH, "XF86Search" },
        { _KEY_VOICE, "XF86Launch2" },
-       { _KEY_QUICKPANEL, "XF86Tools" },
+       { _KEY_QUICK_PANEL, "XF86Tools" },
 
        //{ _KEY_SIDE_UP, "XF86AudioRaiseVolume" },
        //{ _KEY_SIDE_DOWN, "XF86AudioLowerVolume" },

diff --git a/src/ui/controls/FUiCtrl_OptionMenu.cpp b/src/ui/controls/FUiCtrl_OptionMenu.cpp
index 5174d54..c26ac7f 100644 (file)
--- a/src/ui/controls/FUiCtrl_OptionMenu.cpp
+++ b/src/ui/controls/FUiCtrl_OptionMenu.cpp
@@ -225,7 +225,7 @@ _OptionMenu::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 {
        _KeyCode keyCode = keyInfo.GetKeyCode();
 
-       if (keyCode == _KEY_ESC || keyCode == _KEY_CLEAR)
+       if (keyCode == _KEY_ESC || keyCode == _KEY_BACK)
        {
                SetVisibleState(false);
                return true;

diff --git a/src/ui/inc/FUi_UiKeyEvent.h b/src/ui/inc/FUi_UiKeyEvent.h
index 3500791..2f4c1c5 100644 (file)
--- a/src/ui/inc/FUi_UiKeyEvent.h
+++ b/src/ui/inc/FUi_UiKeyEvent.h
@@ -905,7 +905,7 @@ enum _KeyCode
        /**
        *       The quick panel key
        */
-       _KEY_QUICKPANEL = KEY_QUICKPANEL,
+       _KEY_QUICK_PANEL = KEY_QUICK_PANEL,
 
        /**
        *       The clipboard key