diff options
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 3173c962830..1984372f398 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -567,14 +567,14 @@ static DrawInfo *g_di_event_list = NULL; int UI_icon_from_event_type(short event_type, short event_value) { - if (event_type == RIGHTSHIFTKEY) { - event_type = LEFTSHIFTKEY; + if (event_type == EVT_RIGHTSHIFTKEY) { + event_type = EVT_LEFTSHIFTKEY; } - else if (event_type == RIGHTCTRLKEY) { - event_type = LEFTCTRLKEY; + else if (event_type == EVT_RIGHTCTRLKEY) { + event_type = EVT_LEFTCTRLKEY; } - else if (event_type == RIGHTALTKEY) { - event_type = LEFTALTKEY; + else if (event_type == EVT_RIGHTALTKEY) { + event_type = EVT_LEFTALTKEY; } else if (event_type == EVT_TWEAK_L) { event_type = LEFTMOUSE; @@ -648,54 +648,54 @@ static void init_event_icons(void) const int w = 16; /* DUMMY */ - INIT_EVENT_ICON(ICON_EVENT_A, AKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_B, BKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_C, CKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_D, DKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_E, EKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F, FKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_G, GKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_H, HKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_I, IKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_J, JKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_K, KKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_L, LKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_M, MKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_N, NKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_O, OKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_P, PKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_Q, QKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_R, RKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_S, SKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_T, TKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_U, UKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_V, VKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_W, WKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_X, XKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_Y, YKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_Z, ZKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_SHIFT, LEFTSHIFTKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_CTRL, LEFTCTRLKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_ALT, LEFTALTKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_OS, OSKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F1, F1KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F2, F2KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F3, F3KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F4, F4KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F5, F5KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F6, F6KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F7, F7KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F8, F8KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F9, F9KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F10, F10KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F11, F11KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_F12, F12KEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_ESC, ESCKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_TAB, TABKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_PAGEUP, PAGEUPKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_PAGEDOWN, PAGEDOWNKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_RETURN, RETKEY, KM_ANY); - INIT_EVENT_ICON(ICON_EVENT_SPACEKEY, SPACEKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_A, EVT_AKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_B, EVT_BKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_C, EVT_CKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_D, EVT_DKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_E, EVT_EKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F, EVT_FKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_G, EVT_GKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_H, EVT_HKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_I, EVT_IKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_J, EVT_JKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_K, EVT_KKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_L, EVT_LKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_M, EVT_MKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_N, EVT_NKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_O, EVT_OKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_P, EVT_PKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_Q, EVT_QKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_R, EVT_RKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_S, EVT_SKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_T, EVT_TKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_U, EVT_UKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_V, EVT_VKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_W, EVT_WKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_X, EVT_XKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_Y, EVT_YKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_Z, EVT_ZKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_SHIFT, EVT_LEFTSHIFTKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_CTRL, EVT_LEFTCTRLKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_ALT, EVT_LEFTALTKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_OS, EVT_OSKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F1, EVT_F1KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F2, EVT_F2KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F3, EVT_F3KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F4, EVT_F4KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F5, EVT_F5KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F6, EVT_F6KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F7, EVT_F7KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F8, EVT_F8KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F9, EVT_F9KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F10, EVT_F10KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F11, EVT_F11KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F12, EVT_F12KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_ESC, EVT_ESCKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_TAB, EVT_TABKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAGEUP, EVT_PAGEUPKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAGEDOWN, EVT_PAGEDOWNKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_RETURN, EVT_RETKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_SPACEKEY, EVT_SPACEKEY, KM_ANY); g_di_event_list = di_next; |