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

Win32 - Minor GUI cleanup, Minor reshaping of Message Log Dialog

This commit is contained in:
adelikat 2009-02-21 21:52:16 +00:00
parent a93e4b88e4
commit 099c31e948
2 changed files with 108 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
src/drivers/win/res.rc
View File

@ -43,41 +43,41 @@ BEGIN
MENUITEM "&Close", MENU_CLOSE_FILE
MENUITEM "&Recent", MENU_RECENT_FILES
MENUITEM SEPARATOR
POPUP "Savestate"
POPUP "&Savestate"
BEGIN
MENUITEM "Load State", MENU_LOADSTATE
MENUITEM "Save State", MENU_SAVESTATE
MENUITEM "Load State From...", MENU_LOAD_STATE
MENUITEM "Save State As...", MENU_SAVE_STATE
MENUITEM "&Load State", MENU_LOADSTATE
MENUITEM "&Save State", MENU_SAVESTATE
MENUITEM "Load State &From...", MENU_LOAD_STATE
MENUITEM "Save State &As...", MENU_SAVE_STATE
MENUITEM SEPARATOR
MENUITEM "Next save slot", MENU_NEXTSAVESTATE
MENUITEM "Previous save slot", MENU_PREVIOUSSAVESTATE
MENUITEM "View save slots", MENU_VIEWSAVESLOTS
MENUITEM "&Next save slot", MENU_NEXTSAVESTATE
MENUITEM "&Previous save slot", MENU_PREVIOUSSAVESTATE
MENUITEM "&View save slots", MENU_VIEWSAVESLOTS
END
POPUP "Movie"
POPUP "&Movie"
BEGIN
MENUITEM "Record Movie...", MENU_RECORD_MOVIE
MENUITEM "Play Movie...", MENU_REPLAY_MOVIE
MENUITEM "Stop Movie", MENU_STOP_MOVIE
MENUITEM "Play from beginning", ID_FILE_PLAYMOVIEFROMBEGINNING
MENUITEM "&Record Movie...", MENU_RECORD_MOVIE
MENUITEM "&Play Movie...", MENU_REPLAY_MOVIE
MENUITEM "&Stop Movie", MENU_STOP_MOVIE
MENUITEM "Play from &Beginning", ID_FILE_PLAYMOVIEFROMBEGINNING
MENUITEM SEPARATOR
MENUITEM "Read-only", ID_FILE_MOVIE_TOGGLEREAD
MENUITEM "&Read-only", ID_FILE_MOVIE_TOGGLEREAD
END
POPUP "AVI/Wav"
POPUP "&AVI/Wav"
BEGIN
MENUITEM "Record AVI...", MENU_RECORD_AVI
MENUITEM "Stop AVI", MENU_STOP_AVI
MENUITEM "Record WAV...", MENU_RECORD_WAV
MENUITEM "Stop WAV", MENU_STOP_WAV
MENUITEM "&Record AVI...", MENU_RECORD_AVI
MENUITEM "&Stop AVI", MENU_STOP_AVI
MENUITEM "&Record WAV...", MENU_RECORD_WAV
MENUITEM "&Stop WAV", MENU_STOP_WAV
END
POPUP "Lua"
POPUP "&Lua"
BEGIN
MENUITEM "Recent", MENU_LUA_RECENT
MENUITEM "Run Lua Script...", ID_FILE_RUNLUASCRIPT
MENUITEM "Stop Lua Script", ID_FILE_STOPLUASCRIPT
MENUITEM "Reload Lua Script", ID_FILE_LUA_RELOADLUASCRIPT
MENUITEM "&Recent", MENU_LUA_RECENT
MENUITEM "Run &Lua Script...", ID_FILE_RUNLUASCRIPT
MENUITEM "&Stop Lua Script", ID_FILE_STOPLUASCRIPT
MENUITEM "&Reload Lua Script", ID_FILE_LUA_RELOADLUASCRIPT
END
MENUITEM "Screenshot", ID_FILE_SCREENSHOT
MENUITEM "&Screenshot", ID_FILE_SCREENSHOT
MENUITEM SEPARATOR
MENUITEM "E&xit\tAlt+F4", MENU_EXIT
END
@ -90,45 +90,45 @@ BEGIN
MENUITEM "&Switch Disk Side", MENU_SWITCH_DISK
MENUITEM "&Insert Coin", MENU_INSERT_COIN
MENUITEM SEPARATOR
POPUP "Emulation Speed"
POPUP "E&mulation Speed"
BEGIN
MENUITEM "Speed Up", ID_NES_SPEEDUP
MENUITEM "Slow Down", ID_NES_SLOWDOWN
MENUITEM "Speed &Up", ID_NES_SPEEDUP
MENUITEM "Slow &Down", ID_NES_SLOWDOWN
MENUITEM SEPARATOR
MENUITEM "Pause", ID_NES_PAUSE
MENUITEM "Slowest Speed", ID_NES_SLOWESTSPEED
MENUITEM "Normal Speed", ID_NES_NORMALSPEED
MENUITEM "Turbo", ID_NES_TURBO
MENUITEM "&Pause", ID_NES_PAUSE
MENUITEM "&Slowest Speed", ID_NES_SLOWESTSPEED
MENUITEM "&Normal Speed", ID_NES_NORMALSPEED
MENUITEM "&Turbo", ID_NES_TURBO
END
END
POPUP "&Config"
BEGIN
MENUITEM "Hide Menu", MENU_HIDE_MENU
POPUP "Enable"
MENUITEM "&Hide Menu", MENU_HIDE_MENU
POPUP "&Enable"
BEGIN
MENUITEM "Run in Background", MENU_RUN_IN_BACKGROUND
MENUITEM "Background Input", MENU_BACKGROUND_INPUT
MENUITEM "Auto-savestates", MENU_ENABLE_AUTOSAVE
MENUITEM "Frame Adv. - Skip Lag", MENU_DISPLAY_FA_LAGSKIP
MENUITEM "&Run in Background", MENU_RUN_IN_BACKGROUND
MENUITEM "&Background Input", MENU_BACKGROUND_INPUT
MENUITEM "&Auto-savestates", MENU_ENABLE_AUTOSAVE
MENUITEM "&Frame Adv. - Skip Lag", MENU_DISPLAY_FA_LAGSKIP
END
POPUP "Display"
POPUP "&Display"
BEGIN
POPUP "Input Display"
POPUP "&Input Display"
BEGIN
MENUITEM "Off", MENU_INPUTDISPLAY_0
MENUITEM "1 player", MENU_INPUTDISPLAY_1
MENUITEM "2 player", MENU_INPUTDISPLAY_2
MENUITEM "4 player", MENU_INPUTDISPLAY_4
MENUITEM "&Off", MENU_INPUTDISPLAY_0
MENUITEM "&1 player", MENU_INPUTDISPLAY_1
MENUITEM "&2 player", MENU_INPUTDISPLAY_2
MENUITEM "&4 player", MENU_INPUTDISPLAY_4
END
MENUITEM "Lag Counter", MENU_DISPLAY_LAGCOUNTER
MENUITEM "Frame Counter", ID_DISPLAY_FRAMECOUNTER
MENUITEM "&Lag Counter", MENU_DISPLAY_LAGCOUNTER
MENUITEM "&Frame Counter", ID_DISPLAY_FRAMECOUNTER
MENUITEM SEPARATOR
MENUITEM "Graphics: BG", MENU_DISPLAY_BG
MENUITEM "Graphics: OBJ", MENU_DISPLAY_OBJ
MENUITEM "Graphics: &BG", MENU_DISPLAY_BG
MENUITEM "Graphics: &OBJ", MENU_DISPLAY_OBJ
END
MENUITEM SEPARATOR
MENUITEM "Game Genie", MENU_GAME_GENIE
MENUITEM "PAL Emulation", MENU_PAL
MENUITEM "&Game Genie", MENU_GAME_GENIE
MENUITEM "&PAL Emulation", MENU_PAL
MENUITEM SEPARATOR
MENUITEM "&Directories...", MENU_DIRECTORIES
MENUITEM "&GUI...", MENU_GUI_OPTIONS
@ -146,8 +146,8 @@ BEGIN
MENUITEM "&Cheats...", MENU_CHEATS
MENUITEM "&Memory Watch...", MENU_MEMORY_WATCH
MENUITEM "&RAM Filter...", MENU_RAMFILTER
MENUITEM "TAS Edit...", MENU_TASEDIT, INACTIVE
MENUITEM "Convert FCM...", MENU_CONVERT_MOVIE
MENUITEM "&TAS Edit...", MENU_TASEDIT, INACTIVE
MENUITEM "Convert &FCM...", MENU_CONVERT_MOVIE
MENUITEM SEPARATOR
POPUP "Autofire &Pattern"
BEGIN
@ -178,21 +178,21 @@ BEGIN
END
MENUITEM "&Alternate A and B", MENU_ALTERNATE_AB
MENUITEM SEPARATOR
MENUITEM "Text Hooker...", ID_TOOLS_TEXTHOOKER
MENUITEM "Te&xt Hooker...", ID_TOOLS_TEXTHOOKER
END
POPUP "&Debug"
BEGIN
MENUITEM "Debugger...", MENU_DEBUGGER
MENUITEM "PPU Viewer...", MENU_PPUVIEWER
MENUITEM "Name Table Viewer...", MENU_NAMETABLEVIEWER
MENUITEM "Hex Editor...", MENU_HEXEDITOR
MENUITEM "Trace Logger...", MENU_TRACELOGGER
MENUITEM "Code/Data Logger...", MENU_CDLOGGER
MENUITEM "Game Genie Decoder/Encoder...", MENU_GAMEGENIEDECODER
MENUITEM "&Debugger...", MENU_DEBUGGER
MENUITEM "&PPU Viewer...", MENU_PPUVIEWER
MENUITEM "&Name Table Viewer...", MENU_NAMETABLEVIEWER
MENUITEM "&Hex Editor...", MENU_HEXEDITOR
MENUITEM "&Trace Logger...", MENU_TRACELOGGER
MENUITEM "&Code/Data Logger...", MENU_CDLOGGER
MENUITEM "&Game Genie Decoder/Encoder...", MENU_GAMEGENIEDECODER
END
POPUP "&Help"
BEGIN
MENUITEM "Help...", MENU_HELP
MENUITEM "&Help...", MENU_HELP
MENUITEM "&Message Log", MENU_MSGLOG
MENUITEM SEPARATOR
MENUITEM "&About", MENU_ABOUT
@ -655,13 +655,13 @@ BEGIN
RTEXT "Filter:",65484,6,255,21,12,SS_CENTERIMAGE | NOT WS_GROUP
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
CAPTION "Message Log"
FONT 9, "Terminal"
FONT 9, "Terminal", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "Close",1,299,157,56,14
EDITTEXT LBL_LOG_TEXT,19,15,339,130,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
DEFPUSHBUTTON "Close",1,224,220,34,14
EDITTEXT LBL_LOG_TEXT,4,15,254,202,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
END
NETMOO DIALOGEX 44, 59, 365, 209

96
src/drivers/win/window.cpp
View File

@ -2066,82 +2066,82 @@ void UpdateMenuHotkeys()
//Load State
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_LOAD_STATE]);
combined = "Load State\t" + combo;
combined = "&Load State\t" + combo;
ChangeMenuItemText(MENU_LOADSTATE, combined);
//Save State
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_STATE]);
combined = "Save State\t" + combo;
combined = "&Save State\t" + combo;
ChangeMenuItemText(MENU_SAVESTATE, combined);
//Loadstate 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);
//Savestate 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);
//Next Save Slot
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_SLOT_NEXT]);
combined = "Next save slot\t" + combo;
combined = "&Next save slot\t" + combo;
ChangeMenuItemText(MENU_NEXTSAVESTATE, combined);
//Previous Save Slot
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SAVE_SLOT_PREV]);
combined = "Previous save slot\t" + combo;
combined = "&Previous save slot\t" + combo;
ChangeMenuItemText(MENU_PREVIOUSSAVESTATE, combined);
//View Save Slots
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_SHOWSTATES]);
combined = "View save slots\t" + combo;
combined = "&View save slots\t" + combo;
ChangeMenuItemText(MENU_VIEWSAVESLOTS, combined);
//Record Movie
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_RECORD_TO]);
combined = "Record Movie...\t" + combo;
combined = "&Record Movie...\t" + combo;
ChangeMenuItemText(MENU_RECORD_MOVIE, combined);
//Play movie
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_REPLAY_FROM]);
combined = "Play Movie...\t" + combo;
combined = "&Play Movie...\t" + combo;
ChangeMenuItemText(MENU_REPLAY_MOVIE, combined);
//Stop movie
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_STOP]);
combined = "Stop Movie\t" + combo;
combined = "&Stop Movie\t" + combo;
ChangeMenuItemText(MENU_STOP_MOVIE, combined);
//Play Movie 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);
//Read only
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_READONLY_TOGGLE]);
combined = "Read only\t" + combo;
combined = "&Read only\t" + combo;
ChangeMenuItemText(ID_FILE_MOVIE_TOGGLEREAD, combined);
//Screenshot
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SCREENSHOT]);
combined = "Screenshot\t" + combo;
combined = "&Screenshot\t" + combo;
ChangeMenuItemText(ID_FILE_SCREENSHOT, combined);
//Record AVI
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_AVI_RECORD_AS]);
combined = "Record AVI...\t" + combo;
combined = "&Record AVI...\t" + combo;
ChangeMenuItemText(MENU_RECORD_AVI, combined);
//Stop AVI
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_AVI_STOP]);
combined = "Stop AVI\t" + combo;
combined = "&Stop AVI\t" + combo;
ChangeMenuItemText(MENU_STOP_AVI, combined);
//Reload Lua Script
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);
//-------------------------------NES----------------------------------------
@ -2169,76 +2169,66 @@ void UpdateMenuHotkeys()
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_VSUNI_COIN]);
combined = "&Insert Coin\t" + combo;
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
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_FASTER]);
combined = "Speed Up\t" + combo;
combined = "Speed &Up\t" + combo;
ChangeMenuItemText(ID_NES_SPEEDUP, combined);
//Slow Down
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_SLOWER]);
combined = "Slow Down\t" + combo;
combined = "Slow &Down\t" + combo;
ChangeMenuItemText(ID_NES_SLOWDOWN, combined);
//Pause
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_PAUSE]);
combined = "&Pause\t" + combo;
ChangeMenuItemText(ID_NES_PAUSE, combined);
//Slowest Speed
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_SLOWEST]);
combined = "Slowest Speed\t" + combo;
combined = "&Slowest Speed\t" + combo;
ChangeMenuItemText(ID_NES_SLOWESTSPEED, combined);
//Normal Speed
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_NORMAL]);
combined = "Normal Speed\t" + combo;
combined = "&Normal Speed\t" + combo;
ChangeMenuItemText(ID_NES_NORMALSPEED, combined);
//Turbo
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_TURBO_TOGGLE]);
combined = "&Turbo\t" + combo;
ChangeMenuItemText(ID_NES_TURBO, combined);
//-------------------------------Config-------------------------------------
//Hide Menu
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_HIDE_MENU_TOGGLE]);
combined = "Hide Menu\t" + combo;
combined = "&Hide Menu\t" + combo;
ChangeMenuItemText(MENU_HIDE_MENU, combined);
//Frame Adv. skip lag
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);
//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
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_LAGCOUNTER_TOGGLE]);
combined = "Lag Counter\t" + combo;
combined = "&Lag Counter\t" + combo;
ChangeMenuItemText(MENU_DISPLAY_LAGCOUNTER, combined);
//Frame Counter
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_FRAME_DISPLAY_TOGGLE]);
combined = "Frame Counter\t" + combo;
combined = "&Frame Counter\t" + combo;
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
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_BG_TOGGLE]);
combined = "Graphics: BG\t" + combo;
combined = "Graphics: &BG\t" + combo;
ChangeMenuItemText(MENU_DISPLAY_BG, combined);
//Graphics: OBJ
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_OBJ_TOGGLE]);
combined = "Graphics: OBJ\t" + combo;
combined = "Graphics: &OBJ\t" + combo;
ChangeMenuItemText(MENU_DISPLAY_OBJ, combined);
//-------------------------------Tools--------------------------------------
@ -2255,26 +2245,26 @@ void UpdateMenuHotkeys()
//-------------------------------Debug--------------------------------------
//Open Debugger
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENDEBUGGER]);
combined = "Debugger...\t" + combo;
combined = "&Debugger...\t" + combo;
ChangeMenuItemText(MENU_DEBUGGER, combined);
//Open PPU Viewer
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENPPU]);
combined = "PPU Viewer...\t" + combo;
combined = "&PPU Viewer...\t" + combo;
ChangeMenuItemText(MENU_PPUVIEWER, combined);
//Open Hex editor
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENHEX]);
combined = "Hex Editor...\t" + combo;
combined = "&Hex Editor...\t" + combo;
ChangeMenuItemText(MENU_HEXEDITOR, combined);
//Open Trace Logger
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENTRACELOGGER]);
combined = "Trace Logger...\t" + combo;
combined = "&Trace Logger...\t" + combo;
ChangeMenuItemText(MENU_TRACELOGGER, combined);
//Open Code/Data Logger
combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_TOOL_OPENCDLOGGER]);
combined = "Code/Data Logger...\t" + combo;
combined = "&Code/Data Logger...\t" + combo;
ChangeMenuItemText(MENU_CDLOGGER, combined);
}