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

more screwing around with languages

This commit is contained in:
zeromus 2009-12-25 17:18:20 +00:00
parent 0649ef51f5
commit 52b8847c04
9 changed files with 170 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@
#include "GPU_osd.h" #include "GPU_osd.h"
#include "path.h" #include "path.h"
#include "video.h" #include "video.h"
#include "winutil.h"
extern LRESULT OpenFile(); //adelikat: Made this an extern here instead of main.h Seemed icky not to limit the scope of this function extern LRESULT OpenFile(); //adelikat: Made this an extern here instead of main.h Seemed icky not to limit the scope of this function
@ -385,13 +386,6 @@ void HK_ToggleRasterizer(int, bool justPressed) {
//=====================================DEFINITIONS====================================== //=====================================DEFINITIONS======================================
//====================================================================================== //======================================================================================
//returns the specified resource string ID as a std::wstring
std::wstring STRW(UINT id)
{
wchar_t* wstr;
LoadStringW(NULL,id,(LPWSTR)&wstr,0);
return wstr;
}
void InitCustomKeys (SCustomKeys *keys) void InitCustomKeys (SCustomKeys *keys)
{ {
@ -414,7 +408,7 @@ void InitCustomKeys (SCustomKeys *keys)
//Main Page--------------------------------------- //Main Page---------------------------------------
keys->OpenROM.handleKeyDown = HK_OpenROM; keys->OpenROM.handleKeyDown = HK_OpenROM;
keys->OpenROM.code = "OpenROM"; keys->OpenROM.code = "OpenROM";
keys->OpenROM.name = L"Open ROM"; keys->OpenROM.name = STRW(ID_LABEL_HK1);
//keys->OpenROM.name = STRW(ID_LOCALIZED_STRING); //keys->OpenROM.name = STRW(ID_LOCALIZED_STRING);
keys->OpenROM.page = HOTKEY_PAGE_MAIN; keys->OpenROM.page = HOTKEY_PAGE_MAIN;
keys->OpenROM.key = 'O'; keys->OpenROM.key = 'O';
@ -422,150 +416,150 @@ void InitCustomKeys (SCustomKeys *keys)
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 = STRW(ID_LABEL_HK2);
keys->Reset.page = HOTKEY_PAGE_MAIN; keys->Reset.page = HOTKEY_PAGE_MAIN;
keys->Reset.key = 'R'; keys->Reset.key = 'R';
keys->Reset.modifiers = CUSTKEY_CTRL_MASK; keys->Reset.modifiers = CUSTKEY_CTRL_MASK;
keys->Pause.handleKeyDown = HK_Pause; keys->Pause.handleKeyDown = HK_Pause;
keys->Pause.code = "Pause"; keys->Pause.code = "Pause";
keys->Pause.name = L"Pause"; keys->Pause.name = STRW(ID_LABEL_HK3);
keys->Pause.page = HOTKEY_PAGE_MAIN; keys->Pause.page = HOTKEY_PAGE_MAIN;
keys->Pause.key = VK_PAUSE; keys->Pause.key = VK_PAUSE;
keys->FrameAdvance.handleKeyDown = HK_FrameAdvanceKeyDown; keys->FrameAdvance.handleKeyDown = HK_FrameAdvanceKeyDown;
keys->FrameAdvance.handleKeyUp = HK_FrameAdvanceKeyUp; keys->FrameAdvance.handleKeyUp = HK_FrameAdvanceKeyUp;
keys->FrameAdvance.code = "FrameAdvance"; keys->FrameAdvance.code = "FrameAdvance";
keys->FrameAdvance.name = L"Frame Advance"; keys->FrameAdvance.name = STRW(ID_LABEL_HK4);
keys->FrameAdvance.page = HOTKEY_PAGE_MAIN; keys->FrameAdvance.page = HOTKEY_PAGE_MAIN;
keys->FrameAdvance.key = 'N'; keys->FrameAdvance.key = 'N';
keys->FastForward.handleKeyDown = HK_FastForwardKeyDown; keys->FastForward.handleKeyDown = HK_FastForwardKeyDown;
keys->FastForward.handleKeyUp = HK_FastForwardKeyUp; keys->FastForward.handleKeyUp = HK_FastForwardKeyUp;
keys->FastForward.code = "FastForward"; keys->FastForward.code = "FastForward";
keys->FastForward.name = L"Fast Forward"; keys->FastForward.name = STRW(ID_LABEL_HK5);
keys->FastForward.page = HOTKEY_PAGE_MAIN; keys->FastForward.page = HOTKEY_PAGE_MAIN;
keys->FastForward.key = VK_TAB; keys->FastForward.key = VK_TAB;
keys->FastForwardToggle.handleKeyDown = HK_FastForwardToggle; keys->FastForwardToggle.handleKeyDown = HK_FastForwardToggle;
keys->FastForwardToggle.code = "FastForwardToggle"; keys->FastForwardToggle.code = "FastForwardToggle";
keys->FastForwardToggle.name = L"Fast Forward Toggle"; keys->FastForwardToggle.name = STRW(ID_LABEL_HK6);
keys->FastForwardToggle.page = HOTKEY_PAGE_MAIN; keys->FastForwardToggle.page = HOTKEY_PAGE_MAIN;
keys->FastForwardToggle.key = NULL; keys->FastForwardToggle.key = NULL;
keys->IncreaseSpeed.handleKeyDown = HK_IncreaseSpeed; keys->IncreaseSpeed.handleKeyDown = HK_IncreaseSpeed;
keys->IncreaseSpeed.code = "IncreaseSpeed"; keys->IncreaseSpeed.code = "IncreaseSpeed";
keys->IncreaseSpeed.name = L"Increase Speed"; keys->IncreaseSpeed.name = STRW(ID_LABEL_HK7);
keys->IncreaseSpeed.page = HOTKEY_PAGE_MAIN; keys->IncreaseSpeed.page = HOTKEY_PAGE_MAIN;
keys->IncreaseSpeed.key = VK_OEM_PLUS; keys->IncreaseSpeed.key = VK_OEM_PLUS;
keys->DecreaseSpeed.handleKeyDown = HK_DecreaseSpeed; keys->DecreaseSpeed.handleKeyDown = HK_DecreaseSpeed;
keys->DecreaseSpeed.code = "DecreaseSpeed"; keys->DecreaseSpeed.code = "DecreaseSpeed";
keys->DecreaseSpeed.name = L"Decrease Speed"; keys->DecreaseSpeed.name = STRW(ID_LABEL_HK8);
keys->DecreaseSpeed.page = HOTKEY_PAGE_MAIN; keys->DecreaseSpeed.page = HOTKEY_PAGE_MAIN;
keys->DecreaseSpeed.key = VK_OEM_MINUS; keys->DecreaseSpeed.key = VK_OEM_MINUS;
keys->Microphone.handleKeyDown = HK_MicrophoneKeyDown; keys->Microphone.handleKeyDown = HK_MicrophoneKeyDown;
keys->Microphone.handleKeyUp = HK_MicrophoneKeyUp; keys->Microphone.handleKeyUp = HK_MicrophoneKeyUp;
keys->Microphone.code = "Microphone"; keys->Microphone.code = "Microphone";
keys->Microphone.name = L"Microphone"; keys->Microphone.name = STRW(ID_LABEL_HK9);
keys->Microphone.page = HOTKEY_PAGE_MAIN; keys->Microphone.page = HOTKEY_PAGE_MAIN;
keys->Microphone.key = NULL; keys->Microphone.key = NULL;
keys->AutoHold.handleKeyDown = HK_AutoHoldKeyDown; keys->AutoHold.handleKeyDown = HK_AutoHoldKeyDown;
keys->AutoHold.handleKeyUp = HK_AutoHoldKeyUp; keys->AutoHold.handleKeyUp = HK_AutoHoldKeyUp;
keys->AutoHold.code = "AutoHold"; keys->AutoHold.code = "AutoHold";
keys->AutoHold.name = L"Auto-Hold"; keys->AutoHold.name = STRW(ID_LABEL_HK10);
keys->AutoHold.page = HOTKEY_PAGE_MAIN; keys->AutoHold.page = HOTKEY_PAGE_MAIN;
keys->AutoHold.key = NULL; keys->AutoHold.key = NULL;
keys->StylusAutoHold.handleKeyDown = HK_StylusAutoHoldKeyDown; keys->StylusAutoHold.handleKeyDown = HK_StylusAutoHoldKeyDown;
keys->StylusAutoHold.code = "StylusAutoHold"; keys->StylusAutoHold.code = "StylusAutoHold";
keys->StylusAutoHold.name = L"Stylus Auto-Hold"; keys->StylusAutoHold.name = STRW(ID_LABEL_HK29);
keys->StylusAutoHold.page = HOTKEY_PAGE_MOVIE; // TODO: set more appropriate category? keys->StylusAutoHold.page = HOTKEY_PAGE_MOVIE; // TODO: set more appropriate category?
keys->StylusAutoHold.key = NULL; keys->StylusAutoHold.key = NULL;
keys->AutoHoldClear.handleKeyDown = HK_AutoHoldClearKeyDown; keys->AutoHoldClear.handleKeyDown = HK_AutoHoldClearKeyDown;
keys->AutoHoldClear.code = "AutoHoldClear"; keys->AutoHoldClear.code = "AutoHoldClear";
keys->AutoHoldClear.name = L"Auto-Hold Clear"; keys->AutoHoldClear.name = STRW(ID_LABEL_HK11);
keys->AutoHoldClear.page = HOTKEY_PAGE_MAIN; keys->AutoHoldClear.page = HOTKEY_PAGE_MAIN;
keys->AutoHoldClear.key = NULL; keys->AutoHoldClear.key = NULL;
keys->ToggleRasterizer.handleKeyDown = HK_ToggleRasterizer; keys->ToggleRasterizer.handleKeyDown = HK_ToggleRasterizer;
keys->ToggleRasterizer.code = "ToggleRasterizer"; keys->ToggleRasterizer.code = "ToggleRasterizer";
keys->ToggleRasterizer.name = L"Toggle Rasterizer"; keys->ToggleRasterizer.name = STRW(ID_LABEL_HK12);
keys->ToggleRasterizer.page = HOTKEY_PAGE_MAIN; keys->ToggleRasterizer.page = HOTKEY_PAGE_MAIN;
keys->ToggleRasterizer.key = VK_SUBTRACT; keys->ToggleRasterizer.key = VK_SUBTRACT;
keys->PrintScreen.handleKeyDown = HK_PrintScreen; keys->PrintScreen.handleKeyDown = HK_PrintScreen;
keys->PrintScreen.code = "SaveScreenshotas"; keys->PrintScreen.code = "SaveScreenshotas";
keys->PrintScreen.name = L"Save Screenshot as"; keys->PrintScreen.name = STRW(ID_LABEL_HK13);
keys->PrintScreen.page = HOTKEY_PAGE_MAIN; keys->PrintScreen.page = HOTKEY_PAGE_MAIN;
keys->PrintScreen.key = VK_F12; keys->PrintScreen.key = VK_F12;
keys->ToggleFrameCounter.handleKeyDown = HK_ToggleFrame; keys->ToggleFrameCounter.handleKeyDown = HK_ToggleFrame;
keys->ToggleFrameCounter.code = "ToggleFrameDisplay"; keys->ToggleFrameCounter.code = "ToggleFrameDisplay";
keys->ToggleFrameCounter.name = L"Toggle Frame Display"; keys->ToggleFrameCounter.name = STRW(ID_LABEL_HK16);
keys->ToggleFrameCounter.page = HOTKEY_PAGE_MAIN; keys->ToggleFrameCounter.page = HOTKEY_PAGE_MAIN;
keys->ToggleFrameCounter.key = VK_OEM_PERIOD; keys->ToggleFrameCounter.key = VK_OEM_PERIOD;
keys->ToggleFPS.handleKeyDown = HK_ToggleFPS; keys->ToggleFPS.handleKeyDown = HK_ToggleFPS;
keys->ToggleFPS.code = "ToggleFPSDisplay"; keys->ToggleFPS.code = "ToggleFPSDisplay";
keys->ToggleFPS.name = L"Toggle FPS Display"; keys->ToggleFPS.name = STRW(ID_LABEL_HK17);
keys->ToggleFPS.page = HOTKEY_PAGE_MAIN; keys->ToggleFPS.page = HOTKEY_PAGE_MAIN;
keys->ToggleFPS.key = NULL; keys->ToggleFPS.key = NULL;
keys->ToggleInput.handleKeyDown = HK_ToggleInput; keys->ToggleInput.handleKeyDown = HK_ToggleInput;
keys->ToggleInput.code = "ToggleInputDisplay"; keys->ToggleInput.code = "ToggleInputDisplay";
keys->ToggleInput.name = L"Toggle Input Display"; keys->ToggleInput.name = STRW(ID_LABEL_HK18);
keys->ToggleInput.page = HOTKEY_PAGE_MAIN; keys->ToggleInput.page = HOTKEY_PAGE_MAIN;
keys->ToggleInput.key = VK_OEM_COMMA; keys->ToggleInput.key = VK_OEM_COMMA;
keys->ToggleLag.handleKeyDown = HK_ToggleLag; keys->ToggleLag.handleKeyDown = HK_ToggleLag;
keys->ToggleLag.code = "ToggleLagDisplay"; keys->ToggleLag.code = "ToggleLagDisplay";
keys->ToggleLag.name = L"Toggle Lag Display"; keys->ToggleLag.name = STRW(ID_LABEL_HK19);
keys->ToggleLag.page = HOTKEY_PAGE_MAIN; keys->ToggleLag.page = HOTKEY_PAGE_MAIN;
keys->ToggleLag.key = NULL; keys->ToggleLag.key = NULL;
keys->ResetLagCounter.handleKeyDown = HK_ResetLagCounter; keys->ResetLagCounter.handleKeyDown = HK_ResetLagCounter;
keys->ResetLagCounter.code = "ResetLagCounter"; keys->ResetLagCounter.code = "ResetLagCounter";
keys->ResetLagCounter.name = L"Reset Lag Counter"; keys->ResetLagCounter.name = STRW(ID_LABEL_HK20);
keys->ResetLagCounter.page = HOTKEY_PAGE_MAIN; keys->ResetLagCounter.page = HOTKEY_PAGE_MAIN;
keys->ResetLagCounter.key = NULL; keys->ResetLagCounter.key = NULL;
keys->ToggleReadOnly.handleKeyDown = HK_ToggleReadOnly; keys->ToggleReadOnly.handleKeyDown = HK_ToggleReadOnly;
keys->ToggleReadOnly.code = "ToggleReadOnly"; keys->ToggleReadOnly.code = "ToggleReadOnly";
keys->ToggleReadOnly.name = L"Toggle Read Only"; keys->ToggleReadOnly.name = STRW(ID_LABEL_HK24);
keys->ToggleReadOnly.page = HOTKEY_PAGE_MOVIE; keys->ToggleReadOnly.page = HOTKEY_PAGE_MOVIE;
keys->ToggleReadOnly.key = NULL; keys->ToggleReadOnly.key = NULL;
keys->PlayMovie.handleKeyDown = HK_PlayMovie; keys->PlayMovie.handleKeyDown = HK_PlayMovie;
keys->PlayMovie.code = "PlayMovie"; keys->PlayMovie.code = "PlayMovie";
keys->PlayMovie.name = L"Play Movie"; keys->PlayMovie.name = STRW(ID_LABEL_HK21);
keys->PlayMovie.page = HOTKEY_PAGE_MOVIE; keys->PlayMovie.page = HOTKEY_PAGE_MOVIE;
keys->PlayMovie.key = NULL; keys->PlayMovie.key = NULL;
keys->RecordMovie.handleKeyDown = HK_RecordMovie; keys->RecordMovie.handleKeyDown = HK_RecordMovie;
keys->RecordMovie.code = "RecordMovie"; keys->RecordMovie.code = "RecordMovie";
keys->RecordMovie.name = L"Record Movie"; keys->RecordMovie.name = STRW(ID_LABEL_HK22);
keys->RecordMovie.page = HOTKEY_PAGE_MOVIE; keys->RecordMovie.page = HOTKEY_PAGE_MOVIE;
keys->RecordMovie.key = NULL; keys->RecordMovie.key = NULL;
keys->StopMovie.handleKeyDown = HK_StopMovie; keys->StopMovie.handleKeyDown = HK_StopMovie;
keys->StopMovie.code = "StopMovie"; keys->StopMovie.code = "StopMovie";
keys->StopMovie.name = L"Stop Movie"; keys->StopMovie.name = STRW(ID_LABEL_HK23);
keys->StopMovie.page = HOTKEY_PAGE_MOVIE; keys->StopMovie.page = HOTKEY_PAGE_MOVIE;
keys->StopMovie.key = NULL; keys->StopMovie.key = NULL;
keys->RecordWAV.handleKeyDown = HK_RecordWAV; keys->RecordWAV.handleKeyDown = HK_RecordWAV;
keys->RecordWAV.code = "RecordWAV"; keys->RecordWAV.code = "RecordWAV";
keys->RecordWAV.name = L"Record WAV"; keys->RecordWAV.name = STRW(ID_LABEL_HK14);
keys->RecordWAV.page = HOTKEY_PAGE_MAIN; keys->RecordWAV.page = HOTKEY_PAGE_MAIN;
keys->RecordWAV.key = NULL; keys->RecordWAV.key = NULL;
keys->RecordAVI.handleKeyDown = HK_RecordAVI; keys->RecordAVI.handleKeyDown = HK_RecordAVI;
keys->RecordAVI.code = "RecordAVI"; keys->RecordAVI.code = "RecordAVI";
keys->RecordAVI.name = L"Record AVI"; keys->RecordAVI.name = STRW(ID_LABEL_HK15);
keys->RecordAVI.page = HOTKEY_PAGE_MAIN; keys->RecordAVI.page = HOTKEY_PAGE_MAIN;
keys->RecordAVI.key = NULL; keys->RecordAVI.key = NULL;
@ -573,84 +567,84 @@ void InitCustomKeys (SCustomKeys *keys)
keys->TurboRight.handleKeyDown = HK_TurboRightKeyDown; keys->TurboRight.handleKeyDown = HK_TurboRightKeyDown;
keys->TurboRight.handleKeyUp = HK_TurboRightKeyUp; keys->TurboRight.handleKeyUp = HK_TurboRightKeyUp;
keys->TurboRight.code = "TurboRight"; keys->TurboRight.code = "TurboRight";
keys->TurboRight.name = L"Turbo Right"; keys->TurboRight.name = STRW(ID_LABEL_HK41);
keys->TurboRight.page = HOTKEY_PAGE_TURBO; keys->TurboRight.page = HOTKEY_PAGE_TURBO;
keys->TurboRight.key = NULL; keys->TurboRight.key = NULL;
keys->TurboLeft.handleKeyDown = HK_TurboLeftKeyDown; keys->TurboLeft.handleKeyDown = HK_TurboLeftKeyDown;
keys->TurboLeft.handleKeyUp = HK_TurboLeftKeyUp; keys->TurboLeft.handleKeyUp = HK_TurboLeftKeyUp;
keys->TurboLeft.code = "TurboLeft"; keys->TurboLeft.code = "TurboLeft";
keys->TurboLeft.name = L"Turbo Left"; keys->TurboLeft.name = STRW(ID_LABEL_HK42);
keys->TurboLeft.page = HOTKEY_PAGE_TURBO; keys->TurboLeft.page = HOTKEY_PAGE_TURBO;
keys->TurboLeft.key = NULL; keys->TurboLeft.key = NULL;
keys->TurboR.handleKeyDown = HK_TurboRKeyDown; keys->TurboR.handleKeyDown = HK_TurboRKeyDown;
keys->TurboR.handleKeyUp = HK_TurboRKeyUp; keys->TurboR.handleKeyUp = HK_TurboRKeyUp;
keys->TurboR.code = "TurboR"; keys->TurboR.code = "TurboR";
keys->TurboR.name = L"Turbo R"; keys->TurboR.name = STRW(ID_LABEL_HK51);
keys->TurboR.page = HOTKEY_PAGE_TURBO; keys->TurboR.page = HOTKEY_PAGE_TURBO;
keys->TurboR.key = NULL; keys->TurboR.key = NULL;
keys->TurboL.handleKeyDown = HK_TurboLKeyDown; keys->TurboL.handleKeyDown = HK_TurboLKeyDown;
keys->TurboL.handleKeyUp = HK_TurboLKeyUp; keys->TurboL.handleKeyUp = HK_TurboLKeyUp;
keys->TurboL.code = "TurboL"; keys->TurboL.code = "TurboL";
keys->TurboL.name = L"Turbo L"; keys->TurboL.name = STRW(ID_LABEL_HK52);
keys->TurboL.page = HOTKEY_PAGE_TURBO; keys->TurboL.page = HOTKEY_PAGE_TURBO;
keys->TurboL.key = NULL; keys->TurboL.key = NULL;
keys->TurboDown.handleKeyDown = HK_TurboDownKeyDown; keys->TurboDown.handleKeyDown = HK_TurboDownKeyDown;
keys->TurboDown.handleKeyUp = HK_TurboDownKeyUp; keys->TurboDown.handleKeyUp = HK_TurboDownKeyUp;
keys->TurboDown.code = "TurboDown"; keys->TurboDown.code = "TurboDown";
keys->TurboDown.name = L"Turbo Down"; keys->TurboDown.name = STRW(ID_LABEL_HK43);
keys->TurboDown.page = HOTKEY_PAGE_TURBO; keys->TurboDown.page = HOTKEY_PAGE_TURBO;
keys->TurboDown.key = NULL; keys->TurboDown.key = NULL;
keys->TurboUp.handleKeyDown = HK_TurboUpKeyDown; keys->TurboUp.handleKeyDown = HK_TurboUpKeyDown;
keys->TurboUp.handleKeyUp = HK_TurboUpKeyUp; keys->TurboUp.handleKeyUp = HK_TurboUpKeyUp;
keys->TurboUp.code = "TurboUp"; keys->TurboUp.code = "TurboUp";
keys->TurboUp.name = L"Turbo Up"; keys->TurboUp.name = STRW(ID_LABEL_HK44);
keys->TurboUp.page = HOTKEY_PAGE_TURBO; keys->TurboUp.page = HOTKEY_PAGE_TURBO;
keys->TurboUp.key = NULL; keys->TurboUp.key = NULL;
keys->TurboB.handleKeyDown = HK_TurboBKeyDown; keys->TurboB.handleKeyDown = HK_TurboBKeyDown;
keys->TurboB.handleKeyUp = HK_TurboBKeyUp; keys->TurboB.handleKeyUp = HK_TurboBKeyUp;
keys->TurboB.code = "TurboB"; keys->TurboB.code = "TurboB";
keys->TurboB.name = L"Turbo B"; keys->TurboB.name = STRW(ID_LABEL_HK47);
keys->TurboB.page = HOTKEY_PAGE_TURBO; keys->TurboB.page = HOTKEY_PAGE_TURBO;
keys->TurboB.key = NULL; keys->TurboB.key = NULL;
keys->TurboA.handleKeyDown = HK_TurboAKeyDown; keys->TurboA.handleKeyDown = HK_TurboAKeyDown;
keys->TurboA.handleKeyUp = HK_TurboAKeyUp; keys->TurboA.handleKeyUp = HK_TurboAKeyUp;
keys->TurboA.code = "TurboA"; keys->TurboA.code = "TurboA";
keys->TurboA.name = L"Turbo A"; keys->TurboA.name = STRW(ID_LABEL_HK48);
keys->TurboA.page = HOTKEY_PAGE_TURBO; keys->TurboA.page = HOTKEY_PAGE_TURBO;
keys->TurboA.key = NULL; keys->TurboA.key = NULL;
keys->TurboX.handleKeyDown = HK_TurboXKeyDown; keys->TurboX.handleKeyDown = HK_TurboXKeyDown;
keys->TurboX.handleKeyUp = HK_TurboXKeyUp; keys->TurboX.handleKeyUp = HK_TurboXKeyUp;
keys->TurboX.code = "TurboX"; keys->TurboX.code = "TurboX";
keys->TurboX.name = L"Turbo X"; keys->TurboX.name = STRW(ID_LABEL_HK50);
keys->TurboX.page = HOTKEY_PAGE_TURBO; keys->TurboX.page = HOTKEY_PAGE_TURBO;
keys->TurboX.key = NULL; keys->TurboX.key = NULL;
keys->TurboY.handleKeyDown = HK_TurboYKeyDown; keys->TurboY.handleKeyDown = HK_TurboYKeyDown;
keys->TurboY.handleKeyUp = HK_TurboYKeyUp; keys->TurboY.handleKeyUp = HK_TurboYKeyUp;
keys->TurboY.code = "TurboY"; keys->TurboY.code = "TurboY";
keys->TurboY.name = L"Turbo Y"; keys->TurboY.name = STRW(ID_LABEL_HK49);
keys->TurboY.page = HOTKEY_PAGE_TURBO; keys->TurboY.page = HOTKEY_PAGE_TURBO;
keys->TurboY.key = NULL; keys->TurboY.key = NULL;
keys->TurboSelect.handleKeyDown = HK_TurboSelectKeyDown; keys->TurboSelect.handleKeyDown = HK_TurboSelectKeyDown;
keys->TurboSelect.handleKeyUp = HK_TurboSelectKeyUp; keys->TurboSelect.handleKeyUp = HK_TurboSelectKeyUp;
keys->TurboSelect.code = "TurboSelect"; keys->TurboSelect.code = "TurboSelect";
keys->TurboSelect.name = L"Turbo Select"; keys->TurboSelect.name = STRW(ID_LABEL_HK45);
keys->TurboSelect.page = HOTKEY_PAGE_TURBO; keys->TurboSelect.page = HOTKEY_PAGE_TURBO;
keys->TurboSelect.key = NULL; keys->TurboSelect.key = NULL;
keys->TurboStart.handleKeyDown = HK_TurboStartKeyDown; keys->TurboStart.handleKeyDown = HK_TurboStartKeyDown;
keys->TurboStart.handleKeyUp = HK_TurboStartKeyUp; keys->TurboStart.handleKeyUp = HK_TurboStartKeyUp;
keys->TurboStart.code = "TurboStart"; keys->TurboStart.code = "TurboStart";
keys->TurboStart.name = L"Turbo Start"; keys->TurboStart.name = STRW(ID_LABEL_HK46);
keys->TurboStart.page = HOTKEY_PAGE_TURBO; keys->TurboStart.page = HOTKEY_PAGE_TURBO;
keys->TurboStart.key = NULL; keys->TurboStart.key = NULL;
@ -658,74 +652,74 @@ void InitCustomKeys (SCustomKeys *keys)
keys->Rewind.handleKeyDown = HK_RewindKeyDown; keys->Rewind.handleKeyDown = HK_RewindKeyDown;
keys->Rewind.handleKeyUp = HK_RewindKeyUp; keys->Rewind.handleKeyUp = HK_RewindKeyUp;
keys->Rewind.code = "Rewind"; keys->Rewind.code = "Rewind";
keys->Rewind.name = L"Rewind"; keys->Rewind.name = STRW(ID_LABEL_HK25);
keys->Rewind.page = HOTKEY_PAGE_MOVIE; keys->Rewind.page = HOTKEY_PAGE_MOVIE;
keys->Rewind.key = NULL; keys->Rewind.key = NULL;
keys->NewLuaScript.handleKeyDown = HK_NewLuaScriptDown; keys->NewLuaScript.handleKeyDown = HK_NewLuaScriptDown;
keys->NewLuaScript.code = "NewLuaScript"; keys->NewLuaScript.code = "NewLuaScript";
keys->NewLuaScript.name = L"New Lua Window"; keys->NewLuaScript.name = STRW(ID_LABEL_HK26);
keys->NewLuaScript.page = HOTKEY_PAGE_MOVIE; keys->NewLuaScript.page = HOTKEY_PAGE_MOVIE;
keys->NewLuaScript.key = NULL; keys->NewLuaScript.key = NULL;
keys->CloseLuaScripts.handleKeyDown = HK_CloseLuaScriptsDown; keys->CloseLuaScripts.handleKeyDown = HK_CloseLuaScriptsDown;
keys->CloseLuaScripts.code = "CloseLuaScripts"; keys->CloseLuaScripts.code = "CloseLuaScripts";
keys->CloseLuaScripts.name = L"Close Lua Windows"; keys->CloseLuaScripts.name = STRW(ID_LABEL_HK27);
keys->CloseLuaScripts.page = HOTKEY_PAGE_MOVIE; keys->CloseLuaScripts.page = HOTKEY_PAGE_MOVIE;
keys->CloseLuaScripts.key = NULL; keys->CloseLuaScripts.key = NULL;
keys->MostRecentLuaScript.handleKeyDown = HK_MostRecentLuaScriptDown; keys->MostRecentLuaScript.handleKeyDown = HK_MostRecentLuaScriptDown;
keys->MostRecentLuaScript.code = "MostRecentLuaScript"; keys->MostRecentLuaScript.code = "MostRecentLuaScript";
keys->MostRecentLuaScript.name = L"Most Recent Lua Script"; keys->MostRecentLuaScript.name = STRW(ID_LABEL_HK28);
keys->MostRecentLuaScript.page = HOTKEY_PAGE_MOVIE; keys->MostRecentLuaScript.page = HOTKEY_PAGE_MOVIE;
keys->MostRecentLuaScript.key = NULL; keys->MostRecentLuaScript.key = NULL;
keys->LCDsMode.handleKeyUp = HK_LCDsMode; keys->LCDsMode.handleKeyUp = HK_LCDsMode;
keys->LCDsMode.code = "LCDsLayoutMode"; keys->LCDsMode.code = "LCDsLayoutMode";
keys->LCDsMode.name = L"LCDs layout mode"; keys->LCDsMode.name = STRW(ID_LABEL_HK30);
keys->LCDsMode.page = HOTKEY_PAGE_MOVIE; keys->LCDsMode.page = HOTKEY_PAGE_MOVIE;
keys->LCDsMode.key = VK_END; keys->LCDsMode.key = VK_END;
keys->LCDsSwap.handleKeyUp = HK_LCDsSwap; keys->LCDsSwap.handleKeyUp = HK_LCDsSwap;
keys->LCDsSwap.code = "LCDsSwap"; keys->LCDsSwap.code = "LCDsSwap";
keys->LCDsSwap.name = L"LCDs swap"; keys->LCDsSwap.name = STRW(ID_LABEL_HK31);
keys->LCDsSwap.page = HOTKEY_PAGE_MOVIE; keys->LCDsSwap.page = HOTKEY_PAGE_MOVIE;
keys->LCDsSwap.key = VK_NEXT; keys->LCDsSwap.key = VK_NEXT;
keys->IncreaseVolume.handleKeyDown = HK_IncreaseVolume; keys->IncreaseVolume.handleKeyDown = HK_IncreaseVolume;
keys->IncreaseVolume.code = "IncreaseVolume"; keys->IncreaseVolume.code = "IncreaseVolume";
keys->IncreaseVolume.name = L"Increase Volume"; keys->IncreaseVolume.name = STRW(ID_LABEL_HK32);
keys->IncreaseVolume.page = HOTKEY_PAGE_MOVIE; keys->IncreaseVolume.page = HOTKEY_PAGE_MOVIE;
keys->IncreaseVolume.key = NULL; keys->IncreaseVolume.key = NULL;
keys->DecreaseVolume.handleKeyDown = HK_DecreaseVolume; keys->DecreaseVolume.handleKeyDown = HK_DecreaseVolume;
keys->DecreaseVolume.code = "DecreaseVolume"; keys->DecreaseVolume.code = "DecreaseVolume";
keys->DecreaseVolume.name = L"Decrease Volume"; keys->DecreaseVolume.name = STRW(ID_LABEL_HK33);
keys->DecreaseVolume.page = HOTKEY_PAGE_MOVIE; keys->DecreaseVolume.page = HOTKEY_PAGE_MOVIE;
keys->DecreaseVolume.key = NULL; keys->DecreaseVolume.key = NULL;
//StateSlots Page -------------------------------------------------- //StateSlots Page --------------------------------------------------
keys->NextSaveSlot.handleKeyDown = HK_NextSaveSlot; keys->NextSaveSlot.handleKeyDown = HK_NextSaveSlot;
keys->NextSaveSlot.code = "NextSaveSlot"; keys->NextSaveSlot.code = "NextSaveSlot";
keys->NextSaveSlot.name = L"Next Save Slot"; keys->NextSaveSlot.name = STRW(ID_LABEL_HK39);
keys->NextSaveSlot.page = HOTKEY_PAGE_STATE_SLOTS; keys->NextSaveSlot.page = HOTKEY_PAGE_STATE_SLOTS;
keys->NextSaveSlot.key = NULL; keys->NextSaveSlot.key = NULL;
keys->PreviousSaveSlot.handleKeyDown = HK_PreviousSaveSlot; keys->PreviousSaveSlot.handleKeyDown = HK_PreviousSaveSlot;
keys->PreviousSaveSlot.code = "PreviousSaveSlot"; keys->PreviousSaveSlot.code = "PreviousSaveSlot";
keys->PreviousSaveSlot.name = L"Previous Save Slot"; keys->PreviousSaveSlot.name = STRW(ID_LABEL_HK40);
keys->PreviousSaveSlot.page = HOTKEY_PAGE_STATE_SLOTS; keys->PreviousSaveSlot.page = HOTKEY_PAGE_STATE_SLOTS;
keys->PreviousSaveSlot.key = NULL; keys->PreviousSaveSlot.key = NULL;
keys->QuickSave.handleKeyDown = HK_StateQuickSaveSlot; keys->QuickSave.handleKeyDown = HK_StateQuickSaveSlot;
keys->QuickSave.code = "QuickSave"; keys->QuickSave.code = "QuickSave";
keys->QuickSave.name = L"Quick Save"; keys->QuickSave.name = STRW(ID_LABEL_HK37);
keys->QuickSave.page = HOTKEY_PAGE_STATE_SLOTS; keys->QuickSave.page = HOTKEY_PAGE_STATE_SLOTS;
keys->QuickSave.key = 'I'; keys->QuickSave.key = 'I';
keys->QuickLoad.handleKeyDown = HK_StateQuickLoadSlot; keys->QuickLoad.handleKeyDown = HK_StateQuickLoadSlot;
keys->QuickLoad.code = "QuickLoad"; keys->QuickLoad.code = "QuickLoad";
keys->QuickLoad.name = L"Quick Load"; keys->QuickLoad.name = STRW(ID_LABEL_HK38);
keys->QuickLoad.page = HOTKEY_PAGE_STATE_SLOTS; keys->QuickLoad.page = HOTKEY_PAGE_STATE_SLOTS;
keys->QuickLoad.key = 'P'; keys->QuickLoad.key = 'P';
@ -743,7 +737,11 @@ void InitCustomKeys (SCustomKeys *keys)
save.page = HOTKEY_PAGE_STATE; save.page = HOTKEY_PAGE_STATE;
wchar_t tmp[16]; wchar_t tmp[16];
_itow(i,tmp,10); _itow(i,tmp,10);
save.name = (std::wstring)L"Save To Slot " + (std::wstring)tmp; // Support Unicode display
wchar_t menuItemString[256];
LoadStringW(hAppInst, ID_LABEL_HK34, menuItemString, 256);
wcscat(menuItemString,(LPWSTR)tmp);
save.name = menuItemString;
save.code = saveNames[i]; save.code = saveNames[i];
save.key = key; save.key = key;
save.modifiers = CUSTKEY_SHIFT_MASK; save.modifiers = CUSTKEY_SHIFT_MASK;
@ -753,7 +751,10 @@ void InitCustomKeys (SCustomKeys *keys)
load.param = i; load.param = i;
load.page = HOTKEY_PAGE_STATE; load.page = HOTKEY_PAGE_STATE;
_itow(i,tmp,10); _itow(i,tmp,10);
load.name = (std::wstring)L"Load from Slot " + (std::wstring)tmp; // Support Unicode display
LoadStringW(hAppInst, ID_LABEL_HK35, menuItemString, 256);
wcscat(menuItemString,(LPWSTR)tmp);
load.name = menuItemString;
load.code = loadNames[i]; load.code = loadNames[i];
load.key = key; load.key = key;
@ -764,7 +765,10 @@ void InitCustomKeys (SCustomKeys *keys)
slot.param = i; slot.param = i;
slot.page = HOTKEY_PAGE_STATE_SLOTS; slot.page = HOTKEY_PAGE_STATE_SLOTS;
_itow(i,tmp,10); _itow(i,tmp,10);
slot.name = (std::wstring)L"Select Save Slot " + (std::wstring)tmp; // Support Unicode display
LoadStringW(hAppInst, ID_LABEL_HK36, menuItemString, 256);
wcscat(menuItemString,(LPWSTR)tmp);
slot.name = menuItemString;
slot.code = slotNames[i]; slot.code = slotNames[i];
slot.key = key; slot.key = key;
} }

2
desmume/src/windows/inputdx.cpp
View File

@ -365,7 +365,7 @@ static void ReadGuitarControl(const char* name, WORD& output)
} }
} }
static void LoadHotkeyConfig() void LoadHotkeyConfig()
{ {
SCustomKey *key = &CustomKeys.key(0); SCustomKey *key = &CustomKeys.key(0);

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

@ -118,6 +118,7 @@ void RunInputConfig();
void RunHotkeyConfig(); void RunHotkeyConfig();
void input_acquire(); void input_acquire();
void input_process(); void input_process();
void LoadHotkeyConfig();
struct SGuitar { struct SGuitar {
BOOL Enabled; BOOL Enabled;

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

@ -260,17 +260,6 @@ struct DDRAW
#define TABLET_DISABLE_FLICKFALLBACKKEYS 0x00100000 #define TABLET_DISABLE_FLICKFALLBACKKEYS 0x00100000
#endif #endif
void DesEnableMenuItem(HMENU hMenu, UINT uIDEnableItem, bool enable);
inline bool IsDlgCheckboxChecked(HWND hDlg, int id)
{
return IsDlgButtonChecked(hDlg,id) == BST_CHECKED;
}
void CheckDlgItem(HWND hDlg, int id, bool checked)
{
CheckDlgButton(hDlg, id, checked ? BST_CHECKED : BST_UNCHECKED);
}
LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM); LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM);
char SavName[MAX_PATH] = ""; char SavName[MAX_PATH] = "";
@ -290,6 +279,7 @@ RECT FullScreenRect, MainScreenRect, SubScreenRect, GapRect;
RECT MainScreenSrcRect, SubScreenSrcRect; RECT MainScreenSrcRect, SubScreenSrcRect;
int WndX = 0; int WndX = 0;
int WndY = 0; int WndY = 0;
int currLanguage = LANGUAGE_ENGLISH;
extern HWND RamSearchHWnd; extern HWND RamSearchHWnd;
static bool lostFocusPause = true; static bool lostFocusPause = true;
@ -2030,31 +2020,27 @@ void SetLanguage(int langid)
HMODULE kernel32 = LoadLibrary("kernel32.dll"); HMODULE kernel32 = LoadLibrary("kernel32.dll");
FARPROC _setThreadUILanguage = (FARPROC)GetProcAddress(kernel32,"SetThreadUILanguage"); FARPROC _setThreadUILanguage = (FARPROC)GetProcAddress(kernel32,"SetThreadUILanguage");
setLanguageFunc setLanguage = _setThreadUILanguage?(setLanguageFunc)_setThreadUILanguage:(setLanguageFunc)SetThreadLocale; setLanguageFunc setLanguage = _setThreadUILanguage?(setLanguageFunc)_setThreadUILanguage:(setLanguageFunc)SetThreadLocale;
currLanguage = langid;
switch(langid) switch(langid)
{ {
case 0: case LANGUAGE_ENGLISH:
// English
setLanguage(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)); setLanguage(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT));
SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)); SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT));
break; break;
case 1: case LANGUAGE_FRENCH:
// French
setLanguage(MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), SORT_DEFAULT)); setLanguage(MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), SORT_DEFAULT));
SetThreadLocale(MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), SORT_DEFAULT)); SetThreadLocale(MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), SORT_DEFAULT));
break; break;
case 3: case LANGUAGE_CHINESE:
// Chinese
setLanguage(MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT)); setLanguage(MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT));
SetThreadLocale(MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT)); SetThreadLocale(MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT));
break; break;
case 4: case LANGUAGE_ITALIAN:
// Italian
setLanguage(MAKELCID(MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), SORT_DEFAULT)); setLanguage(MAKELCID(MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), SORT_DEFAULT));
SetThreadLocale(MAKELCID(MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), SORT_DEFAULT)); SetThreadLocale(MAKELCID(MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), SORT_DEFAULT));
break; break;
case 5: case LANGUAGE_JAPANESE:
// Japanese
setLanguage(MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT)); setLanguage(MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT));
SetThreadLocale(MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT)); SetThreadLocale(MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT));
break; break;
@ -2064,23 +2050,19 @@ void SetLanguage(int langid)
} }
FreeLibrary(kernel32); FreeLibrary(kernel32);
WritePrivateProfileInt("General", "Language", langid, IniName);
InitCustomKeys(&CustomKeys);
LoadHotkeyConfig();
} }
void SaveLanguage(int langid) static void CheckLanguage(UINT id)
{ {
char text[80]; //int i;
//for (i = IDC_LANGENGLISH; i < IDC_LANGJAPANESE+1; i++)
// MainWindow->checkMenu(i, false);
sprintf(text, "%d", langid); //MainWindow->checkMenu(id, true);
WritePrivateProfileString("General", "Language", text, IniName);
}
void CheckLanguage(UINT id)
{
int i;
for (i = IDC_LANGENGLISH; i < IDC_LANGJAPANESE+1; i++)
MainWindow->checkMenu(i, false);
MainWindow->checkMenu(id, true);
} }
void ChangeLanguage(int id) void ChangeLanguage(int id)
@ -5060,29 +5042,19 @@ DOKEYDOWN:
SendMessage(LuaScriptHWnds[i], WM_CLOSE, 0,0); SendMessage(LuaScriptHWnds[i], WM_CLOSE, 0,0);
break; break;
case IDC_LANGENGLISH: case IDC_LANGENGLISH:
SaveLanguage(0); ChangeLanguage(LANGUAGE_ENGLISH);
ChangeLanguage(0);
CheckLanguage(LOWORD(wParam));
return 0; return 0;
case IDC_LANGFRENCH: case IDC_LANGFRENCH:
SaveLanguage(1); ChangeLanguage(LANGUAGE_FRENCH);
ChangeLanguage(1);
CheckLanguage(LOWORD(wParam));
return 0; return 0;
case IDC_LANG_CHINESE_SIMPLIFIED: case IDC_LANG_CHINESE_SIMPLIFIED:
SaveLanguage(3); ChangeLanguage(LANGUAGE_CHINESE);
ChangeLanguage(3);
CheckLanguage(LOWORD(wParam));
return 0; return 0;
case IDC_LANGITALIAN: case IDC_LANGITALIAN:
SaveLanguage(4); ChangeLanguage(LANGUAGE_ITALIAN);
ChangeLanguage(4);
CheckLanguage(LOWORD(wParam));
return 0; return 0;
case IDC_LANGJAPANESE: case IDC_LANGJAPANESE:
SaveLanguage(5); ChangeLanguage(LANGUAGE_JAPANESE);
ChangeLanguage(5);
CheckLanguage(LOWORD(wParam));
return 0; return 0;
case IDC_FRAMELIMIT: case IDC_FRAMELIMIT:

6
desmume/src/windows/main.h
View File

@ -30,6 +30,12 @@ extern bool ShowLagFrameCounter;
#define GPU3D_OPENGL 1 #define GPU3D_OPENGL 1
#define GPU3D_SWRAST 2 #define GPU3D_SWRAST 2
static const int LANGUAGE_ENGLISH = 0;
static const int LANGUAGE_FRENCH = 1;
static const int LANGUAGE_CHINESE = 3;
static const int LANGUAGE_ITALIAN = 4;
static const int LANGUAGE_JAPANESE = 5;
extern void Change3DCoreWithFallbackAndSave(int newCore, int fallbackCore=GPU3D_SWRAST); extern void Change3DCoreWithFallbackAndSave(int newCore, int fallbackCore=GPU3D_SWRAST);
extern int backupmemorytype; extern int backupmemorytype;

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

@ -807,6 +807,59 @@
#define IDM_RENDER_HQ2XS 60081 #define IDM_RENDER_HQ2XS 60081
#define IDM_RENDER_LQ2X 60082 #define IDM_RENDER_LQ2X 60082
#define IDM_RENDER_LQ2XS 60083 #define IDM_RENDER_LQ2XS 60083
#define ID_LABEL_HK1 70001
#define ID_LABEL_HK2 70002
#define ID_LABEL_HK3 70003
#define ID_LABEL_HK4 70004
#define ID_LABEL_HK5 70005
#define ID_LABEL_HK6 70006
#define ID_LABEL_HK7 70007
#define ID_LABEL_HK8 70008
#define ID_LABEL_HK9 70009
#define ID_LABEL_HK10 70010
#define ID_LABEL_HK11 70011
#define ID_LABEL_HK12 70012
#define ID_LABEL_HK13 70013
#define ID_LABEL_HK14 70014
#define ID_LABEL_HK15 70015
#define ID_LABEL_HK16 70016
#define ID_LABEL_HK17 70017
#define ID_LABEL_HK18 70018
#define ID_LABEL_HK19 70019
#define ID_LABEL_HK20 70020
#define ID_LABEL_HK21 70021
#define ID_LABEL_HK22 70022
#define ID_LABEL_HK23 70023
#define ID_LABEL_HK24 70024
#define ID_LABEL_HK25 70025
#define ID_LABEL_HK26 70026
#define ID_LABEL_HK27 70027
#define ID_LABEL_HK28 70028
#define ID_LABEL_HK29 70029
#define ID_LABEL_HK30 70030
#define ID_LABEL_HK31 70031
#define ID_LABEL_HK32 70032
#define ID_LABEL_HK33 70033
#define ID_LABEL_HK34 70034
#define ID_LABEL_HK35 70035
#define ID_LABEL_HK36 70036
#define ID_LABEL_HK37 70037
#define ID_LABEL_HK38 70038
#define ID_LABEL_HK39 70039
#define ID_LABEL_HK40 70040
#define ID_LABEL_HK41 70041
#define ID_LABEL_HK42 70042
#define ID_LABEL_HK43 70043
#define ID_LABEL_HK44 70044
#define ID_LABEL_HK45 70045
#define ID_LABEL_HK46 70046
#define ID_LABEL_HK47 70047
#define ID_LABEL_HK48 70048
#define ID_LABEL_HK49 70049
#define ID_LABEL_HK50 70050
#define ID_LABEL_HK51 70051
#define ID_LABEL_HK52 70052
// Next default values for new objects // Next default values for new objects
// //

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

Binary file not shown.

19
desmume/src/windows/winutil.cpp
View File

@ -96,3 +96,22 @@ std::string GetPrivateProfileStdString(LPCSTR lpAppName,LPCSTR lpKeyName,LPCSTR
GetPrivateProfileString(lpAppName, lpKeyName, lpDefault, buf, 65536, IniName); GetPrivateProfileString(lpAppName, lpKeyName, lpDefault, buf, 65536, IniName);
return buf; return buf;
} }
std::wstring STRW(UINT id)
{
wchar_t* wstr;
LoadStringW(NULL,id,(LPWSTR)&wstr,0);
if(wstr==0) return L"";
else return wstr;
}
bool IsDlgCheckboxChecked(HWND hDlg, int id)
{
return IsDlgButtonChecked(hDlg,id) == BST_CHECKED;
}
void CheckDlgItem(HWND hDlg, int id, bool checked)
{
CheckDlgButton(hDlg, id, checked ? BST_CHECKED : BST_UNCHECKED);
}

5
desmume/src/windows/winutil.h
View File

@ -33,6 +33,11 @@ void GetINIPath();
void PreventScreensaver(); void PreventScreensaver();
void DesEnableMenuItem(HMENU hMenu, UINT uIDEnableItem, bool enable); void DesEnableMenuItem(HMENU hMenu, UINT uIDEnableItem, bool enable);
std::string GetPrivateProfileStdString(LPCSTR lpAppName,LPCSTR lpKeyName,LPCSTR lpDefault); std::string GetPrivateProfileStdString(LPCSTR lpAppName,LPCSTR lpKeyName,LPCSTR lpDefault);
void CheckDlgItem(HWND hDlg, int id, bool checked);
bool IsDlgCheckboxChecked(HWND hDlg, int id);
//returns the specified resource string ID as a std::wstring
std::wstring STRW(UINT id);
inline bool operator==(const RECT& lhs, const RECT& rhs) inline bool operator==(const RECT& lhs, const RECT& rhs)
{ {