Win32 - Minor GUI cleanup, Minor reshaping of Message Log Dialog
This commit is contained in:
parent
a93e4b88e4
commit
099c31e948
|
@ -43,41 +43,41 @@ BEGIN
|
||||||
MENUITEM "&Close", MENU_CLOSE_FILE
|
MENUITEM "&Close", MENU_CLOSE_FILE
|
||||||
MENUITEM "&Recent", MENU_RECENT_FILES
|
MENUITEM "&Recent", MENU_RECENT_FILES
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
POPUP "Savestate"
|
POPUP "&Savestate"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Load State", MENU_LOADSTATE
|
MENUITEM "&Load State", MENU_LOADSTATE
|
||||||
MENUITEM "Save State", MENU_SAVESTATE
|
MENUITEM "&Save State", MENU_SAVESTATE
|
||||||
MENUITEM "Load State From...", MENU_LOAD_STATE
|
MENUITEM "Load State &From...", MENU_LOAD_STATE
|
||||||
MENUITEM "Save State As...", MENU_SAVE_STATE
|
MENUITEM "Save State &As...", MENU_SAVE_STATE
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "Next save slot", MENU_NEXTSAVESTATE
|
MENUITEM "&Next save slot", MENU_NEXTSAVESTATE
|
||||||
MENUITEM "Previous save slot", MENU_PREVIOUSSAVESTATE
|
MENUITEM "&Previous save slot", MENU_PREVIOUSSAVESTATE
|
||||||
MENUITEM "View save slots", MENU_VIEWSAVESLOTS
|
MENUITEM "&View save slots", MENU_VIEWSAVESLOTS
|
||||||
END
|
END
|
||||||
POPUP "Movie"
|
POPUP "&Movie"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Record Movie...", MENU_RECORD_MOVIE
|
MENUITEM "&Record Movie...", MENU_RECORD_MOVIE
|
||||||
MENUITEM "Play Movie...", MENU_REPLAY_MOVIE
|
MENUITEM "&Play Movie...", MENU_REPLAY_MOVIE
|
||||||
MENUITEM "Stop Movie", MENU_STOP_MOVIE
|
MENUITEM "&Stop Movie", MENU_STOP_MOVIE
|
||||||
MENUITEM "Play from beginning", ID_FILE_PLAYMOVIEFROMBEGINNING
|
MENUITEM "Play from &Beginning", ID_FILE_PLAYMOVIEFROMBEGINNING
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "Read-only", ID_FILE_MOVIE_TOGGLEREAD
|
MENUITEM "&Read-only", ID_FILE_MOVIE_TOGGLEREAD
|
||||||
END
|
END
|
||||||
POPUP "AVI/Wav"
|
POPUP "&AVI/Wav"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Record AVI...", MENU_RECORD_AVI
|
MENUITEM "&Record AVI...", MENU_RECORD_AVI
|
||||||
MENUITEM "Stop AVI", MENU_STOP_AVI
|
MENUITEM "&Stop AVI", MENU_STOP_AVI
|
||||||
MENUITEM "Record WAV...", MENU_RECORD_WAV
|
MENUITEM "&Record WAV...", MENU_RECORD_WAV
|
||||||
MENUITEM "Stop WAV", MENU_STOP_WAV
|
MENUITEM "&Stop WAV", MENU_STOP_WAV
|
||||||
END
|
END
|
||||||
POPUP "Lua"
|
POPUP "&Lua"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Recent", MENU_LUA_RECENT
|
MENUITEM "&Recent", MENU_LUA_RECENT
|
||||||
MENUITEM "Run Lua Script...", ID_FILE_RUNLUASCRIPT
|
MENUITEM "Run &Lua Script...", ID_FILE_RUNLUASCRIPT
|
||||||
MENUITEM "Stop Lua Script", ID_FILE_STOPLUASCRIPT
|
MENUITEM "&Stop Lua Script", ID_FILE_STOPLUASCRIPT
|
||||||
MENUITEM "Reload Lua Script", ID_FILE_LUA_RELOADLUASCRIPT
|
MENUITEM "&Reload Lua Script", ID_FILE_LUA_RELOADLUASCRIPT
|
||||||
END
|
END
|
||||||
MENUITEM "Screenshot", ID_FILE_SCREENSHOT
|
MENUITEM "&Screenshot", ID_FILE_SCREENSHOT
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "E&xit\tAlt+F4", MENU_EXIT
|
MENUITEM "E&xit\tAlt+F4", MENU_EXIT
|
||||||
END
|
END
|
||||||
|
@ -90,45 +90,45 @@ BEGIN
|
||||||
MENUITEM "&Switch Disk Side", MENU_SWITCH_DISK
|
MENUITEM "&Switch Disk Side", MENU_SWITCH_DISK
|
||||||
MENUITEM "&Insert Coin", MENU_INSERT_COIN
|
MENUITEM "&Insert Coin", MENU_INSERT_COIN
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
POPUP "Emulation Speed"
|
POPUP "E&mulation Speed"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Speed Up", ID_NES_SPEEDUP
|
MENUITEM "Speed &Up", ID_NES_SPEEDUP
|
||||||
MENUITEM "Slow Down", ID_NES_SLOWDOWN
|
MENUITEM "Slow &Down", ID_NES_SLOWDOWN
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "Pause", ID_NES_PAUSE
|
MENUITEM "&Pause", ID_NES_PAUSE
|
||||||
MENUITEM "Slowest Speed", ID_NES_SLOWESTSPEED
|
MENUITEM "&Slowest Speed", ID_NES_SLOWESTSPEED
|
||||||
MENUITEM "Normal Speed", ID_NES_NORMALSPEED
|
MENUITEM "&Normal Speed", ID_NES_NORMALSPEED
|
||||||
MENUITEM "Turbo", ID_NES_TURBO
|
MENUITEM "&Turbo", ID_NES_TURBO
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
POPUP "&Config"
|
POPUP "&Config"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Hide Menu", MENU_HIDE_MENU
|
MENUITEM "&Hide Menu", MENU_HIDE_MENU
|
||||||
POPUP "Enable"
|
POPUP "&Enable"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Run in Background", MENU_RUN_IN_BACKGROUND
|
MENUITEM "&Run in Background", MENU_RUN_IN_BACKGROUND
|
||||||
MENUITEM "Background Input", MENU_BACKGROUND_INPUT
|
MENUITEM "&Background Input", MENU_BACKGROUND_INPUT
|
||||||
MENUITEM "Auto-savestates", MENU_ENABLE_AUTOSAVE
|
MENUITEM "&Auto-savestates", MENU_ENABLE_AUTOSAVE
|
||||||
MENUITEM "Frame Adv. - Skip Lag", MENU_DISPLAY_FA_LAGSKIP
|
MENUITEM "&Frame Adv. - Skip Lag", MENU_DISPLAY_FA_LAGSKIP
|
||||||
END
|
END
|
||||||
POPUP "Display"
|
POPUP "&Display"
|
||||||
BEGIN
|
BEGIN
|
||||||
POPUP "Input Display"
|
POPUP "&Input Display"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Off", MENU_INPUTDISPLAY_0
|
MENUITEM "&Off", MENU_INPUTDISPLAY_0
|
||||||
MENUITEM "1 player", MENU_INPUTDISPLAY_1
|
MENUITEM "&1 player", MENU_INPUTDISPLAY_1
|
||||||
MENUITEM "2 player", MENU_INPUTDISPLAY_2
|
MENUITEM "&2 player", MENU_INPUTDISPLAY_2
|
||||||
MENUITEM "4 player", MENU_INPUTDISPLAY_4
|
MENUITEM "&4 player", MENU_INPUTDISPLAY_4
|
||||||
END
|
END
|
||||||
MENUITEM "Lag Counter", MENU_DISPLAY_LAGCOUNTER
|
MENUITEM "&Lag Counter", MENU_DISPLAY_LAGCOUNTER
|
||||||
MENUITEM "Frame Counter", ID_DISPLAY_FRAMECOUNTER
|
MENUITEM "&Frame Counter", ID_DISPLAY_FRAMECOUNTER
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "Graphics: BG", MENU_DISPLAY_BG
|
MENUITEM "Graphics: &BG", MENU_DISPLAY_BG
|
||||||
MENUITEM "Graphics: OBJ", MENU_DISPLAY_OBJ
|
MENUITEM "Graphics: &OBJ", MENU_DISPLAY_OBJ
|
||||||
END
|
END
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "Game Genie", MENU_GAME_GENIE
|
MENUITEM "&Game Genie", MENU_GAME_GENIE
|
||||||
MENUITEM "PAL Emulation", MENU_PAL
|
MENUITEM "&PAL Emulation", MENU_PAL
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "&Directories...", MENU_DIRECTORIES
|
MENUITEM "&Directories...", MENU_DIRECTORIES
|
||||||
MENUITEM "&GUI...", MENU_GUI_OPTIONS
|
MENUITEM "&GUI...", MENU_GUI_OPTIONS
|
||||||
|
@ -146,8 +146,8 @@ BEGIN
|
||||||
MENUITEM "&Cheats...", MENU_CHEATS
|
MENUITEM "&Cheats...", MENU_CHEATS
|
||||||
MENUITEM "&Memory Watch...", MENU_MEMORY_WATCH
|
MENUITEM "&Memory Watch...", MENU_MEMORY_WATCH
|
||||||
MENUITEM "&RAM Filter...", MENU_RAMFILTER
|
MENUITEM "&RAM Filter...", MENU_RAMFILTER
|
||||||
MENUITEM "TAS Edit...", MENU_TASEDIT, INACTIVE
|
MENUITEM "&TAS Edit...", MENU_TASEDIT, INACTIVE
|
||||||
MENUITEM "Convert FCM...", MENU_CONVERT_MOVIE
|
MENUITEM "Convert &FCM...", MENU_CONVERT_MOVIE
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
POPUP "Autofire &Pattern"
|
POPUP "Autofire &Pattern"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
@ -178,21 +178,21 @@ BEGIN
|
||||||
END
|
END
|
||||||
MENUITEM "&Alternate A and B", MENU_ALTERNATE_AB
|
MENUITEM "&Alternate A and B", MENU_ALTERNATE_AB
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "Text Hooker...", ID_TOOLS_TEXTHOOKER
|
MENUITEM "Te&xt Hooker...", ID_TOOLS_TEXTHOOKER
|
||||||
END
|
END
|
||||||
POPUP "&Debug"
|
POPUP "&Debug"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Debugger...", MENU_DEBUGGER
|
MENUITEM "&Debugger...", MENU_DEBUGGER
|
||||||
MENUITEM "PPU Viewer...", MENU_PPUVIEWER
|
MENUITEM "&PPU Viewer...", MENU_PPUVIEWER
|
||||||
MENUITEM "Name Table Viewer...", MENU_NAMETABLEVIEWER
|
MENUITEM "&Name Table Viewer...", MENU_NAMETABLEVIEWER
|
||||||
MENUITEM "Hex Editor...", MENU_HEXEDITOR
|
MENUITEM "&Hex Editor...", MENU_HEXEDITOR
|
||||||
MENUITEM "Trace Logger...", MENU_TRACELOGGER
|
MENUITEM "&Trace Logger...", MENU_TRACELOGGER
|
||||||
MENUITEM "Code/Data Logger...", MENU_CDLOGGER
|
MENUITEM "&Code/Data Logger...", MENU_CDLOGGER
|
||||||
MENUITEM "Game Genie Decoder/Encoder...", MENU_GAMEGENIEDECODER
|
MENUITEM "&Game Genie Decoder/Encoder...", MENU_GAMEGENIEDECODER
|
||||||
END
|
END
|
||||||
POPUP "&Help"
|
POPUP "&Help"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "Help...", MENU_HELP
|
MENUITEM "&Help...", MENU_HELP
|
||||||
MENUITEM "&Message Log", MENU_MSGLOG
|
MENUITEM "&Message Log", MENU_MSGLOG
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "&About", MENU_ABOUT
|
MENUITEM "&About", MENU_ABOUT
|
||||||
|
@ -655,13 +655,13 @@ BEGIN
|
||||||
RTEXT "Filter:",65484,6,255,21,12,SS_CENTERIMAGE | NOT WS_GROUP
|
RTEXT "Filter:",65484,6,255,21,12,SS_CENTERIMAGE | NOT WS_GROUP
|
||||||
END
|
END
|
||||||
|
|
||||||
MESSAGELOG DIALOG 33, 38, 370, 184
|
MESSAGELOG DIALOGEX 33, 38, 262, 237
|
||||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
|
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
|
||||||
CAPTION "Message Log"
|
CAPTION "Message Log"
|
||||||
FONT 9, "Terminal"
|
FONT 9, "Terminal", 0, 0, 0x0
|
||||||
BEGIN
|
BEGIN
|
||||||
DEFPUSHBUTTON "Close",1,299,157,56,14
|
DEFPUSHBUTTON "Close",1,224,220,34,14
|
||||||
EDITTEXT LBL_LOG_TEXT,19,15,339,130,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
|
EDITTEXT LBL_LOG_TEXT,4,15,254,202,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
|
||||||
END
|
END
|
||||||
|
|
||||||
NETMOO DIALOGEX 44, 59, 365, 209
|
NETMOO DIALOGEX 44, 59, 365, 209
|
||||||
|
|
|
@ -2066,82 +2066,82 @@ void UpdateMenuHotkeys()
|
||||||
|
|
||||||
//Load State
|
//Load State
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_LOAD_STATE]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_LOAD_STATE]);
|
||||||
combined = "Load State\t" + combo;
|
combined = "&Load State\t" + combo;
|
||||||
ChangeMenuItemText(MENU_LOADSTATE, combined);
|
ChangeMenuItemText(MENU_LOADSTATE, combined);
|
||||||
|
|
||||||
//Save State
|
//Save State
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_STATE]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_STATE]);
|
||||||
combined = "Save State\t" + combo;
|
combined = "&Save State\t" + combo;
|
||||||
ChangeMenuItemText(MENU_SAVESTATE, combined);
|
ChangeMenuItemText(MENU_SAVESTATE, combined);
|
||||||
|
|
||||||
//Loadstate from
|
//Loadstate from
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_LOAD_STATE_FROM]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_LOAD_STATE_FROM]);
|
||||||
combined = "Load State From...\t" + combo;
|
combined = "Load State &From...\t" + combo;
|
||||||
ChangeMenuItemText(MENU_LOAD_STATE, combined);
|
ChangeMenuItemText(MENU_LOAD_STATE, combined);
|
||||||
|
|
||||||
//Savestate as
|
//Savestate as
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_STATE_AS]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_STATE_AS]);
|
||||||
combined = "Save State As...\t" + combo;
|
combined = "Save State &As...\t" + combo;
|
||||||
ChangeMenuItemText(MENU_SAVE_STATE, combined);
|
ChangeMenuItemText(MENU_SAVE_STATE, combined);
|
||||||
|
|
||||||
//Next Save Slot
|
//Next Save Slot
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_SLOT_NEXT]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_SLOT_NEXT]);
|
||||||
combined = "Next save slot\t" + combo;
|
combined = "&Next save slot\t" + combo;
|
||||||
ChangeMenuItemText(MENU_NEXTSAVESTATE, combined);
|
ChangeMenuItemText(MENU_NEXTSAVESTATE, combined);
|
||||||
|
|
||||||
//Previous Save Slot
|
//Previous Save Slot
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_SLOT_PREV]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_SLOT_PREV]);
|
||||||
combined = "Previous save slot\t" + combo;
|
combined = "&Previous save slot\t" + combo;
|
||||||
ChangeMenuItemText(MENU_PREVIOUSSAVESTATE, combined);
|
ChangeMenuItemText(MENU_PREVIOUSSAVESTATE, combined);
|
||||||
|
|
||||||
//View Save Slots
|
//View Save Slots
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_SHOWSTATES]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_SHOWSTATES]);
|
||||||
combined = "View save slots\t" + combo;
|
combined = "&View save slots\t" + combo;
|
||||||
ChangeMenuItemText(MENU_VIEWSAVESLOTS, combined);
|
ChangeMenuItemText(MENU_VIEWSAVESLOTS, combined);
|
||||||
|
|
||||||
//Record Movie
|
//Record Movie
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_RECORD_TO]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_RECORD_TO]);
|
||||||
combined = "Record Movie...\t" + combo;
|
combined = "&Record Movie...\t" + combo;
|
||||||
ChangeMenuItemText(MENU_RECORD_MOVIE, combined);
|
ChangeMenuItemText(MENU_RECORD_MOVIE, combined);
|
||||||
|
|
||||||
//Play movie
|
//Play movie
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_REPLAY_FROM]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_REPLAY_FROM]);
|
||||||
combined = "Play Movie...\t" + combo;
|
combined = "&Play Movie...\t" + combo;
|
||||||
ChangeMenuItemText(MENU_REPLAY_MOVIE, combined);
|
ChangeMenuItemText(MENU_REPLAY_MOVIE, combined);
|
||||||
|
|
||||||
//Stop movie
|
//Stop movie
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_STOP]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_STOP]);
|
||||||
combined = "Stop Movie\t" + combo;
|
combined = "&Stop Movie\t" + combo;
|
||||||
ChangeMenuItemText(MENU_STOP_MOVIE, combined);
|
ChangeMenuItemText(MENU_STOP_MOVIE, combined);
|
||||||
|
|
||||||
//Play Movie from Beginning
|
//Play Movie from Beginning
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_PLAY_FROM_BEGINNING]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_PLAY_FROM_BEGINNING]);
|
||||||
combined = "Play from beginning\t" + combo;
|
combined = "Play from &Beginning\t" + combo;
|
||||||
ChangeMenuItemText(ID_FILE_PLAYMOVIEFROMBEGINNING, combined);
|
ChangeMenuItemText(ID_FILE_PLAYMOVIEFROMBEGINNING, combined);
|
||||||
|
|
||||||
//Read only
|
//Read only
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_READONLY_TOGGLE]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_READONLY_TOGGLE]);
|
||||||
combined = "Read only\t" + combo;
|
combined = "&Read only\t" + combo;
|
||||||
ChangeMenuItemText(ID_FILE_MOVIE_TOGGLEREAD, combined);
|
ChangeMenuItemText(ID_FILE_MOVIE_TOGGLEREAD, combined);
|
||||||
|
|
||||||
//Screenshot
|
//Screenshot
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SCREENSHOT]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SCREENSHOT]);
|
||||||
combined = "Screenshot\t" + combo;
|
combined = "&Screenshot\t" + combo;
|
||||||
ChangeMenuItemText(ID_FILE_SCREENSHOT, combined);
|
ChangeMenuItemText(ID_FILE_SCREENSHOT, combined);
|
||||||
|
|
||||||
//Record AVI
|
//Record AVI
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_AVI_RECORD_AS]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_AVI_RECORD_AS]);
|
||||||
combined = "Record AVI...\t" + combo;
|
combined = "&Record AVI...\t" + combo;
|
||||||
ChangeMenuItemText(MENU_RECORD_AVI, combined);
|
ChangeMenuItemText(MENU_RECORD_AVI, combined);
|
||||||
|
|
||||||
//Stop AVI
|
//Stop AVI
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_AVI_STOP]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_AVI_STOP]);
|
||||||
combined = "Stop AVI\t" + combo;
|
combined = "&Stop AVI\t" + combo;
|
||||||
ChangeMenuItemText(MENU_STOP_AVI, combined);
|
ChangeMenuItemText(MENU_STOP_AVI, combined);
|
||||||
|
|
||||||
//Reload Lua Script
|
//Reload Lua Script
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SCRIPT_RELOAD]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SCRIPT_RELOAD]);
|
||||||
combined = "Reload Lua Script\t" + combo;
|
combined = "&Reload Lua Script\t" + combo;
|
||||||
ChangeMenuItemText(ID_FILE_LUA_RELOADLUASCRIPT, combined);
|
ChangeMenuItemText(ID_FILE_LUA_RELOADLUASCRIPT, combined);
|
||||||
|
|
||||||
//-------------------------------NES----------------------------------------
|
//-------------------------------NES----------------------------------------
|
||||||
|
@ -2169,76 +2169,66 @@ void UpdateMenuHotkeys()
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_VSUNI_COIN]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_VSUNI_COIN]);
|
||||||
combined = "&Insert Coin\t" + combo;
|
combined = "&Insert Coin\t" + combo;
|
||||||
ChangeMenuItemText(MENU_INSERT_COIN, combined);
|
ChangeMenuItemText(MENU_INSERT_COIN, combined);
|
||||||
|
|
||||||
//Pause
|
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_PAUSE]);
|
|
||||||
combined = "Pause\t" + combo;
|
|
||||||
ChangeMenuItemText(ID_NES_PAUSE, combined);
|
|
||||||
|
|
||||||
//Turbo
|
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_TURBO_TOGGLE]);
|
|
||||||
combined = "Turbo\t" + combo;
|
|
||||||
ChangeMenuItemText(ID_NES_TURBO, combined);
|
|
||||||
|
|
||||||
//Speed Up
|
//Speed Up
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_FASTER]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_FASTER]);
|
||||||
combined = "Speed Up\t" + combo;
|
combined = "Speed &Up\t" + combo;
|
||||||
ChangeMenuItemText(ID_NES_SPEEDUP, combined);
|
ChangeMenuItemText(ID_NES_SPEEDUP, combined);
|
||||||
|
|
||||||
//Slow Down
|
//Slow Down
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_SLOWER]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_SLOWER]);
|
||||||
combined = "Slow Down\t" + combo;
|
combined = "Slow &Down\t" + combo;
|
||||||
ChangeMenuItemText(ID_NES_SLOWDOWN, combined);
|
ChangeMenuItemText(ID_NES_SLOWDOWN, combined);
|
||||||
|
|
||||||
|
//Pause
|
||||||
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_PAUSE]);
|
||||||
|
combined = "&Pause\t" + combo;
|
||||||
|
ChangeMenuItemText(ID_NES_PAUSE, combined);
|
||||||
|
|
||||||
//Slowest Speed
|
//Slowest Speed
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_SLOWEST]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_SLOWEST]);
|
||||||
combined = "Slowest Speed\t" + combo;
|
combined = "&Slowest Speed\t" + combo;
|
||||||
ChangeMenuItemText(ID_NES_SLOWESTSPEED, combined);
|
ChangeMenuItemText(ID_NES_SLOWESTSPEED, combined);
|
||||||
|
|
||||||
//Normal Speed
|
//Normal Speed
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_NORMAL]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_NORMAL]);
|
||||||
combined = "Normal Speed\t" + combo;
|
combined = "&Normal Speed\t" + combo;
|
||||||
ChangeMenuItemText(ID_NES_NORMALSPEED, combined);
|
ChangeMenuItemText(ID_NES_NORMALSPEED, combined);
|
||||||
|
|
||||||
|
//Turbo
|
||||||
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_TURBO_TOGGLE]);
|
||||||
|
combined = "&Turbo\t" + combo;
|
||||||
|
ChangeMenuItemText(ID_NES_TURBO, combined);
|
||||||
|
|
||||||
//-------------------------------Config-------------------------------------
|
//-------------------------------Config-------------------------------------
|
||||||
//Hide Menu
|
//Hide Menu
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_HIDE_MENU_TOGGLE]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_HIDE_MENU_TOGGLE]);
|
||||||
combined = "Hide Menu\t" + combo;
|
combined = "&Hide Menu\t" + combo;
|
||||||
ChangeMenuItemText(MENU_HIDE_MENU, combined);
|
ChangeMenuItemText(MENU_HIDE_MENU, combined);
|
||||||
|
|
||||||
//Frame Adv. skip lag
|
//Frame Adv. skip lag
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_FRAMEADV_SKIPLAG]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_FRAMEADV_SKIPLAG]);
|
||||||
combined = "Frame Adv. - Skip Lag\t" + combo;
|
combined = "&Frame Adv. - Skip Lag\t" + combo;
|
||||||
ChangeMenuItemText(MENU_DISPLAY_FA_LAGSKIP, combined);
|
ChangeMenuItemText(MENU_DISPLAY_FA_LAGSKIP, combined);
|
||||||
|
|
||||||
//Movie Status Icon
|
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_ICON_DISPLAY_TOGGLE]);
|
|
||||||
combined = "Movie Status Icon\t" + combo;
|
|
||||||
ChangeMenuItemText(MENU_SHOW_STATUS_ICON, combined);
|
|
||||||
|
|
||||||
//Lag Counter
|
//Lag Counter
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_LAGCOUNTER_TOGGLE]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_LAGCOUNTER_TOGGLE]);
|
||||||
combined = "Lag Counter\t" + combo;
|
combined = "&Lag Counter\t" + combo;
|
||||||
ChangeMenuItemText(MENU_DISPLAY_LAGCOUNTER, combined);
|
ChangeMenuItemText(MENU_DISPLAY_LAGCOUNTER, combined);
|
||||||
|
|
||||||
//Frame Counter
|
//Frame Counter
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_FRAME_DISPLAY_TOGGLE]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_FRAME_DISPLAY_TOGGLE]);
|
||||||
combined = "Frame Counter\t" + combo;
|
combined = "&Frame Counter\t" + combo;
|
||||||
ChangeMenuItemText(ID_DISPLAY_FRAMECOUNTER, combined);
|
ChangeMenuItemText(ID_DISPLAY_FRAMECOUNTER, combined);
|
||||||
|
|
||||||
//Movie Subtitles
|
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_MOVIESUBTITLES]);
|
|
||||||
combined = "Movie Subtitles\t" + combo;
|
|
||||||
ChangeMenuItemText(ID_DISPLAY_MOVIESUBTITLES, combined);
|
|
||||||
|
|
||||||
//Graphics: BG
|
//Graphics: BG
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_BG_TOGGLE]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_BG_TOGGLE]);
|
||||||
combined = "Graphics: BG\t" + combo;
|
combined = "Graphics: &BG\t" + combo;
|
||||||
ChangeMenuItemText(MENU_DISPLAY_BG, combined);
|
ChangeMenuItemText(MENU_DISPLAY_BG, combined);
|
||||||
|
|
||||||
//Graphics: OBJ
|
//Graphics: OBJ
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_OBJ_TOGGLE]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_OBJ_TOGGLE]);
|
||||||
combined = "Graphics: OBJ\t" + combo;
|
combined = "Graphics: &OBJ\t" + combo;
|
||||||
ChangeMenuItemText(MENU_DISPLAY_OBJ, combined);
|
ChangeMenuItemText(MENU_DISPLAY_OBJ, combined);
|
||||||
|
|
||||||
//-------------------------------Tools--------------------------------------
|
//-------------------------------Tools--------------------------------------
|
||||||
|
@ -2255,26 +2245,26 @@ void UpdateMenuHotkeys()
|
||||||
//-------------------------------Debug--------------------------------------
|
//-------------------------------Debug--------------------------------------
|
||||||
//Open Debugger
|
//Open Debugger
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENDEBUGGER]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENDEBUGGER]);
|
||||||
combined = "Debugger...\t" + combo;
|
combined = "&Debugger...\t" + combo;
|
||||||
ChangeMenuItemText(MENU_DEBUGGER, combined);
|
ChangeMenuItemText(MENU_DEBUGGER, combined);
|
||||||
|
|
||||||
//Open PPU Viewer
|
//Open PPU Viewer
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENPPU]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENPPU]);
|
||||||
combined = "PPU Viewer...\t" + combo;
|
combined = "&PPU Viewer...\t" + combo;
|
||||||
ChangeMenuItemText(MENU_PPUVIEWER, combined);
|
ChangeMenuItemText(MENU_PPUVIEWER, combined);
|
||||||
|
|
||||||
//Open Hex editor
|
//Open Hex editor
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENHEX]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENHEX]);
|
||||||
combined = "Hex Editor...\t" + combo;
|
combined = "&Hex Editor...\t" + combo;
|
||||||
ChangeMenuItemText(MENU_HEXEDITOR, combined);
|
ChangeMenuItemText(MENU_HEXEDITOR, combined);
|
||||||
|
|
||||||
//Open Trace Logger
|
//Open Trace Logger
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENTRACELOGGER]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENTRACELOGGER]);
|
||||||
combined = "Trace Logger...\t" + combo;
|
combined = "&Trace Logger...\t" + combo;
|
||||||
ChangeMenuItemText(MENU_TRACELOGGER, combined);
|
ChangeMenuItemText(MENU_TRACELOGGER, combined);
|
||||||
|
|
||||||
//Open Code/Data Logger
|
//Open Code/Data Logger
|
||||||
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENCDLOGGER]);
|
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENCDLOGGER]);
|
||||||
combined = "Code/Data Logger...\t" + combo;
|
combined = "&Code/Data Logger...\t" + combo;
|
||||||
ChangeMenuItemText(MENU_CDLOGGER, combined);
|
ChangeMenuItemText(MENU_CDLOGGER, combined);
|
||||||
}
|
}
|
Loading…
Reference in New Issue