diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index 4256fb3ae..c48dbc13c 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -1570,6 +1570,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM case IDM_QUIT: DestroyWindow(hwnd); return 0; + case ACCEL_CTRL_O: case IDM_OPEN: { int filterSize = 0, i = 0; diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index 38983687d..54e7df96d 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -344,13 +344,15 @@ #define ACCEL_7 40028 #define ACCEL_8 40029 #define ACCEL_9 40030 +#define ID_ACCELERATOR40032 40032 +#define ACCEL_CTRL_O 40032 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 107 -#define _APS_NEXT_COMMAND_VALUE 40032 +#define _APS_NEXT_COMMAND_VALUE 40034 #define _APS_NEXT_CONTROL_VALUE 1018 #define _APS_NEXT_SYMED_VALUE 112 #endif diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index 45e314b6f..347502952 100644 --- a/desmume/src/windows/resources.rc +++ b/desmume/src/windows/resources.rc @@ -27,7 +27,19 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDR_MAIN_ACCEL ACCELERATORS BEGIN + "0", ACCEL_0, VIRTKEY, NOINVERT + "1", ACCEL_1, VIRTKEY, NOINVERT + "2", ACCEL_2, VIRTKEY, NOINVERT + "3", ACCEL_3, VIRTKEY, NOINVERT + "4", ACCEL_4, VIRTKEY, NOINVERT + "5", ACCEL_5, VIRTKEY, NOINVERT + "6", ACCEL_6, VIRTKEY, NOINVERT + "7", ACCEL_7, VIRTKEY, NOINVERT + "8", ACCEL_8, VIRTKEY, NOINVERT + "9", ACCEL_9, VIRTKEY, NOINVERT + "I", ACCEL_I, VIRTKEY, NOINVERT "N", ACCEL_N, VIRTKEY, NOINVERT + "P", ACCEL_P, VIRTKEY, NOINVERT VK_SPACE, ACCEL_SPACEBAR, VIRTKEY, NOINVERT VK_F1, IDM_STATE_LOAD_F1, VIRTKEY, NOINVERT VK_F10, IDM_STATE_LOAD_F10, VIRTKEY, NOINVERT @@ -49,18 +61,7 @@ BEGIN VK_F7, IDM_STATE_SAVE_F7, VIRTKEY, SHIFT, NOINVERT VK_F8, IDM_STATE_SAVE_F8, VIRTKEY, SHIFT, NOINVERT VK_F9, IDM_STATE_SAVE_F9, VIRTKEY, SHIFT, NOINVERT - "I", ACCEL_I, VIRTKEY, NOINVERT - "P", ACCEL_P, VIRTKEY, NOINVERT - "0", ACCEL_0, VIRTKEY, NOINVERT - "1", ACCEL_1, VIRTKEY, NOINVERT - "2", ACCEL_2, VIRTKEY, NOINVERT - "3", ACCEL_3, VIRTKEY, NOINVERT - "4", ACCEL_4, VIRTKEY, NOINVERT - "5", ACCEL_5, VIRTKEY, NOINVERT - "6", ACCEL_6, VIRTKEY, NOINVERT - "7", ACCEL_7, VIRTKEY, NOINVERT - "8", ACCEL_8, VIRTKEY, NOINVERT - "9", ACCEL_9, VIRTKEY, NOINVERT + "O", ACCEL_CTRL_O, VIRTKEY, CONTROL, NOINVERT END #endif // Neutral resources @@ -681,7 +682,7 @@ MENU_PRINCIPAL MENU BEGIN POPUP "&File" BEGIN - MENUITEM "&Open", IDM_OPEN + MENUITEM "&Open...\tCtrl O", IDM_OPEN MENUITEM "Rom &Info", IDM_GAME_INFO MENUITEM SEPARATOR MENUITEM "Save State As", IDM_STATE_SAVE