ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added Open ROM Hotkey, Removed Ctrl+O accel key.

This commit is contained in:
adelikat 2009-04-13 04:56:51 +00:00
parent f054fc3da6
commit 97789af476
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
desmume/src/windows/hotkey.cpp
View File

@ -28,6 +28,8 @@
#include "throttle.h" #include "throttle.h"
#include "../mic.h" #include "../mic.h"
extern LRESULT OpenFile(); //adelikat: Made this an extern here instead of main.h Seemed icky not to limit the scope of this function
SCustomKeys CustomKeys; SCustomKeys CustomKeys;
bool AutoHoldPressed=false; bool AutoHoldPressed=false;
@ -68,7 +70,7 @@ void CopyCustomKeys (SCustomKeys *dst, const SCustomKeys *src)
//====================================================================================== //======================================================================================
//=====================================HANDLERS========================================= //=====================================HANDLERS=========================================
//====================================================================================== //======================================================================================
void HK_OpenROM(int) {OpenFile();}
void HK_PrintScreen(int param) void HK_PrintScreen(int param)
{ {
OPENFILENAME ofn; OPENFILENAME ofn;
@ -239,6 +241,13 @@ void InitCustomKeys (SCustomKeys *keys)
}; };
//Main Page--------------------------------------- //Main Page---------------------------------------
keys->OpenROM.handleKeyDown = HK_OpenROM;
keys->OpenROM.code = "OpenROM";
keys->OpenROM.name = L"Open ROM";
keys->OpenROM.page = HOTKEY_PAGE_MAIN;
keys->OpenROM.key = 'O';
keys->OpenROM.modifiers = CUSTKEY_CTRL_MASK;
keys->Reset.handleKeyDown = HK_Reset; keys->Reset.handleKeyDown = HK_Reset;
keys->Reset.code = "Reset"; keys->Reset.code = "Reset";
keys->Reset.name = L"Reset"; keys->Reset.name = L"Reset";

2
desmume/src/windows/hotkey.h
View File

@ -65,7 +65,7 @@ struct SCustomKeys
SCustomKey Slot[10]; SCustomKey Slot[10];
SCustomKey QuickSave, QuickLoad; SCustomKey QuickSave, QuickLoad;
SCustomKey Reset, Pause, FrameAdvance, FastForward, FastForwardToggle, IncreaseSpeed, DecreaseSpeed, Microphone; SCustomKey OpenROM, Reset, Pause, FrameAdvance, FastForward, FastForwardToggle, IncreaseSpeed, DecreaseSpeed, Microphone;
SCustomKey TurboRight, TurboLeft, TurboDown, TurboUp, TurboSelect, TurboStart, TurboB, TurboA, TurboY, TurboX; SCustomKey TurboRight, TurboLeft, TurboDown, TurboUp, TurboSelect, TurboStart, TurboB, TurboA, TurboY, TurboX;

1
desmume/src/windows/main.cpp
View File

@ -2548,7 +2548,6 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
case IDM_QUIT: case IDM_QUIT:
DestroyWindow(hwnd); DestroyWindow(hwnd);
return 0; return 0;
case ACCEL_CTRL_O:
case IDM_OPEN: case IDM_OPEN:
return OpenFile(); return OpenFile();
case IDM_PRINTSCREEN: case IDM_PRINTSCREEN:

1
desmume/src/windows/resource.h
View File

@ -426,7 +426,6 @@
#define ID_VIEW_DISPLAYMICROPHONE 40014 #define ID_VIEW_DISPLAYMICROPHONE 40014
#define IDM_FILE_RECORDAVI 40015 #define IDM_FILE_RECORDAVI 40015
#define IDM_FILE_STOPAVI 40016 #define IDM_FILE_STOPAVI 40016
#define ACCEL_CTRL_O 40032
#define ID_FILE_RECENTROM 40034 #define ID_FILE_RECENTROM 40034
#define IDC_SAVETYPE7 40037 #define IDC_SAVETYPE7 40037
#define IDM_DEFSIZE 40038 #define IDM_DEFSIZE 40038

1
desmume/src/windows/resources.rc
View File

@ -2445,5 +2445,4 @@ FONT 8, "Ms Shell Dlg"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MAIN_ACCEL ACCELERATORS IDR_MAIN_ACCEL ACCELERATORS
{ {
"O", ACCEL_CTRL_O, VIRTKEY, CONTROL
} }