Bug 939006 part.11 Sort out key names in Browser Keys section r=smaug

This commit is contained in:
Masayuki Nakano 2014-06-04 21:43:45 +09:00
parent 2cc7039399
commit 120051ef7f
2 changed files with 39 additions and 32 deletions

View File

@ -258,18 +258,22 @@ DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication16)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication17)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication18)
/******************************************************************************
* Browser Keys
*****************************************************************************/
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserBack)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserFavorites)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserForward)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserHome)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserRefresh)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserSearch)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserStop)
DEFINE_KEYNAME_WITH_SAME_NAME(Apps)
DEFINE_KEYNAME_WITH_SAME_NAME(List)
DEFINE_KEYNAME_WITH_SAME_NAME(Info)
DEFINE_KEYNAME_WITH_SAME_NAME(Exit)
DEFINE_KEYNAME_WITH_SAME_NAME(Zoom)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserFavorites)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserHome)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserRefresh)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserSearch)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserStop)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserBack)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserForward)
DEFINE_KEYNAME_WITH_SAME_NAME(UpLeft)
DEFINE_KEYNAME_WITH_SAME_NAME(UpRight)
DEFINE_KEYNAME_WITH_SAME_NAME(DownLeft)

View File

@ -858,27 +858,26 @@ KEY_MAP_QT (LaunchApplication17, Qt::Key_LaunchG)
// LaunchApplication18
KEY_MAP_QT (LaunchApplication18, Qt::Key_LaunchH)
// Apps
KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
// List
// Info
KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
// Exit
KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)
// Zoom
KEY_MAP_WIN (Zoom, VK_ZOOM)
KEY_MAP_QT (Zoom, Qt::Key_Zoom)
/******************************************************************************
* Browser Keys
******************************************************************************/
// BrowserBack
KEY_MAP_WIN (BrowserBack, VK_BROWSER_BACK)
KEY_MAP_GTK (BrowserBack, GDK_Back)
KEY_MAP_QT (BrowserBack, Qt::Key_Back)
KEY_MAP_ANDROID (BrowserBack, AKEYCODE_BACK)
// BrowserFavorites
KEY_MAP_WIN (BrowserFavorites, VK_BROWSER_FAVORITES)
KEY_MAP_QT (BrowserFavorites, Qt::Key_Favorites)
KEY_MAP_ANDROID (BrowserFavorites, AKEYCODE_BOOKMARK)
// BrowserForward
KEY_MAP_WIN (BrowserForward, VK_BROWSER_FORWARD)
KEY_MAP_GTK (BrowserForward, GDK_Forward)
KEY_MAP_QT (BrowserForward, Qt::Key_Forward)
KEY_MAP_ANDROID (BrowserForward, AKEYCODE_FORWARD)
// BrowserHome
KEY_MAP_WIN (BrowserHome, VK_BROWSER_HOME)
KEY_MAP_GTK (BrowserHome, GDK_HomePage)
@ -902,17 +901,21 @@ KEY_MAP_WIN (BrowserStop, VK_BROWSER_STOP)
KEY_MAP_GTK (BrowserStop, GDK_Stop)
KEY_MAP_QT (BrowserStop, Qt::Key_Stop)
// BrowserBack
KEY_MAP_WIN (BrowserBack, VK_BROWSER_BACK)
KEY_MAP_GTK (BrowserBack, GDK_Back)
KEY_MAP_QT (BrowserBack, Qt::Key_Back)
KEY_MAP_ANDROID (BrowserBack, AKEYCODE_BACK)
// BrowserForward
KEY_MAP_WIN (BrowserForward, VK_BROWSER_FORWARD)
KEY_MAP_GTK (BrowserForward, GDK_Forward)
KEY_MAP_QT (BrowserForward, Qt::Key_Forward)
KEY_MAP_ANDROID (BrowserForward, AKEYCODE_FORWARD)
// Apps
KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
// List
// Info
KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
// Exit
KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)
// Zoom
KEY_MAP_WIN (Zoom, VK_ZOOM)
KEY_MAP_QT (Zoom, Qt::Key_Zoom)
// UpLeft