Bug 912866 Rename key values of color buttons to the latest D3E draft's names (like 'ColorF0Red') r=smaug

This commit is contained in:
Masayuki Nakano 2014-12-30 10:47:54 +09:00
Родитель 0fa15c7ffb
Коммит 897a3b7ca7
2 изменённых файлов: 22 добавлений и 18 удалений

Просмотреть файл

@ -283,12 +283,12 @@ DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostUp)
// DEFINE_KEYNAME_WITH_SAME_NAME(AVRPower)
DEFINE_KEYNAME_WITH_SAME_NAME(ChannelDown)
DEFINE_KEYNAME_WITH_SAME_NAME(ChannelUp)
DEFINE_KEYNAME_WITH_SAME_NAME(Red) // Rename to ColorF0Red
DEFINE_KEYNAME_WITH_SAME_NAME(Green) // Rename to ColorF1Green
DEFINE_KEYNAME_WITH_SAME_NAME(Yellow) // Rename to ColorF2Yellow
DEFINE_KEYNAME_WITH_SAME_NAME(Blue) // Rename to ColorF3Blue
// DEFINE_KEYNAME_WITH_SAME_NAME(Grey) // Rename to ColorF4Grey
// DEFINE_KEYNAME_WITH_SAME_NAME(Brown) // Rename to ColorF5Brown
DEFINE_KEYNAME_WITH_SAME_NAME(ColorF0Red)
DEFINE_KEYNAME_WITH_SAME_NAME(ColorF1Green)
DEFINE_KEYNAME_WITH_SAME_NAME(ColorF2Yellow)
DEFINE_KEYNAME_WITH_SAME_NAME(ColorF3Blue)
// DEFINE_KEYNAME_WITH_SAME_NAME(ColorF4Grey)
// DEFINE_KEYNAME_WITH_SAME_NAME(ColorF5Brown)
// DEFINE_KEYNAME_WITH_SAME_NAME(ClosedCaptionToggle)
DEFINE_KEYNAME_WITH_SAME_NAME(Dimmer)
// DEFINE_KEYNAME_WITH_SAME_NAME(DisplaySwap)

Просмотреть файл

@ -916,21 +916,25 @@ KEY_MAP_ANDROID (ChannelDown, AKEYCODE_CHANNEL_DOWN)
// ChannelUp
KEY_MAP_ANDROID (ChannelUp, AKEYCODE_CHANNEL_UP)
// Red
KEY_MAP_GTK (Red, GDK_Red)
KEY_MAP_ANDROID (Red, AKEYCODE_PROG_RED)
// ColorF0Red
KEY_MAP_GTK (ColorF0Red, GDK_Red)
KEY_MAP_QT (ColorF0Red, Qt::Key_Red)
KEY_MAP_ANDROID (ColorF0Red, AKEYCODE_PROG_RED)
// Green
KEY_MAP_GTK (Green, GDK_Green)
KEY_MAP_ANDROID (Green, AKEYCODE_PROG_GREEN)
// ColorF1Green
KEY_MAP_GTK (ColorF1Green, GDK_Green)
KEY_MAP_QT (ColorF1Green, Qt::Key_Green)
KEY_MAP_ANDROID (ColorF1Green, AKEYCODE_PROG_GREEN)
// Yellow
KEY_MAP_GTK (Yellow, GDK_Yellow)
KEY_MAP_ANDROID (Yellow, AKEYCODE_PROG_YELLOW)
// ColorF2Yellow
KEY_MAP_GTK (ColorF2Yellow, GDK_Yellow)
KEY_MAP_QT (ColorF2Yellow, Qt::Key_Yellow)
KEY_MAP_ANDROID (ColorF2Yellow, AKEYCODE_PROG_YELLOW)
// Blue
KEY_MAP_GTK (Blue, GDK_Blue)
KEY_MAP_ANDROID (Blue, AKEYCODE_PROG_BLUE)
// ColorF3Blue
KEY_MAP_GTK (ColorF3Blue, GDK_Blue)
KEY_MAP_QT (ColorF3Blue, Qt::Key_Blue)
KEY_MAP_ANDROID (ColorF3Blue, AKEYCODE_PROG_BLUE)
// Dimmer
KEY_MAP_GTK (Dimmer, GDK_BrightnessAdjust)