Win32 - Minor GUI Menu cleanup

This commit is contained in:
adelikat 2009-02-23 14:32:06 +00:00
parent 008ec6ceca
commit 9a4b12d5a7
2 changed files with 44 additions and 44 deletions

View File

@ -1060,14 +1060,14 @@ void CollapseWindow(void)
wrect.right = (wrect.right - ((wrect.right-wrect.left)/2)); wrect.right = (wrect.right - ((wrect.right-wrect.left)/2));
MemWCollapsed = true; MemWCollapsed = true;
SetDlgItemText(hwndMemWatch, MEMW_EXPANDCOLLAPSE, ">"); //Put Address value SetDlgItemText(hwndMemWatch, MEMW_EXPANDCOLLAPSE, ">"); //Put Address value
ChangeMemwMenuItemText(MEMW_OPTIONS_EXPANDCOLLAPSE, "Expand to 2 columns"); ChangeMemwMenuItemText(MEMW_OPTIONS_EXPANDCOLLAPSE, "&Expand to 2 columns");
} }
else else
{ {
wrect.right = (wrect.right + (wrect.right-wrect.left)); wrect.right = (wrect.right + (wrect.right-wrect.left));
MemWCollapsed = false; MemWCollapsed = false;
SetDlgItemText(hwndMemWatch, MEMW_EXPANDCOLLAPSE, "<"); //Put Address value SetDlgItemText(hwndMemWatch, MEMW_EXPANDCOLLAPSE, "<"); //Put Address value
ChangeMemwMenuItemText(MEMW_OPTIONS_EXPANDCOLLAPSE, "Collapse to 1 column"); ChangeMemwMenuItemText(MEMW_OPTIONS_EXPANDCOLLAPSE, "&Collapse to 1 column");
} }
SetWindowPos(hwndMemWatch,NULL,MemWatch_wndx,MemWatch_wndy,(wrect.right-wrect.left),(wrect.bottom-wrect.top),NULL); SetWindowPos(hwndMemWatch,NULL,MemWatch_wndx,MemWatch_wndy,(wrect.right-wrect.left),(wrect.bottom-wrect.top),NULL);

View File

@ -206,33 +206,33 @@ BEGIN
MENUITEM "&New Project\tCtrl+N", ID_FILE_NEWPROJECT MENUITEM "&New Project\tCtrl+N", ID_FILE_NEWPROJECT
MENUITEM "&Open Project...\tCtrl+O", ID_FILE_OPENPROJECT MENUITEM "&Open Project...\tCtrl+O", ID_FILE_OPENPROJECT
MENUITEM "&Save Project\tCtrl+S", ID_FILE_SAVEPROJECT MENUITEM "&Save Project\tCtrl+S", ID_FILE_SAVEPROJECT
MENUITEM "Save Project As...\tCtrl+Shift+S", ID_FILE_SAVEPROJECTAS MENUITEM "S&ave Project As...\tCtrl+Shift+S", ID_FILE_SAVEPROJECTAS
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Import FM2", ID_FILE_IMPORTFM2 MENUITEM "&Import FM2", ID_FILE_IMPORTFM2
MENUITEM "Export to FM2", ID_FILE_EXPORTFM2 MENUITEM "&Export to FM2", ID_FILE_EXPORTFM2
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Close\tAlt+F4", ID_TASEDIT_FILE_CLOSE MENUITEM "&Close\tAlt+F4", ID_TASEDIT_FILE_CLOSE
END END
POPUP "Edit" POPUP "&Edit"
BEGIN BEGIN
MENUITEM "Select All", ID_EDIT_SELECTALL MENUITEM "&Select All", ID_EDIT_SELECTALL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Cut\tCtrl+X", ID_TASEDIT_CUT MENUITEM "Cu&t\tCtrl+X", ID_TASEDIT_CUT
MENUITEM "Copy\tCtrl+C", ID_TASEDIT_COPY MENUITEM "&Copy\tCtrl+C", ID_TASEDIT_COPY
MENUITEM "Paste\tCtrl+V", ID_TASEDIT_PASTE MENUITEM "&Paste\tCtrl+V", ID_TASEDIT_PASTE
MENUITEM "Paste to New\tCtrl+Shift+V", ID_TASEDIT_PASTETONEW MENUITEM "Paste to &New\tCtrl+Shift+V", ID_TASEDIT_PASTETONEW
MENUITEM "Delete\tCtrl+Delete", ID_TASEDIT_DELETE MENUITEM "&Delete\tCtrl+Delete", ID_TASEDIT_DELETE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Add Marker", ID_EDIT_ADDMARKER MENUITEM "&Add Marker", ID_EDIT_ADDMARKER
MENUITEM "Remove Marker", ID_EDIT_REMOVEMARKER MENUITEM "&Remove Marker", ID_EDIT_REMOVEMARKER
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Truncate\tCtrl+T", ID_EDIT_TRUNCATE MENUITEM "&Truncate\tCtrl+T", ID_EDIT_TRUNCATE
MENUITEM "Branch\tCtrl+B", ID_EDIT_BRANCH MENUITEM "&Branch\tCtrl+B", ID_EDIT_BRANCH
END END
MENUITEM "View", ID_VIEW MENUITEM "&View", ID_VIEW
POPUP "Help" POPUP "&Help"
BEGIN BEGIN
MENUITEM "TASEdit Help", ID_HELP_TASEDITHELP MENUITEM "&TASEdit Help...", ID_HELP_TASEDITHELP
END END
END END
@ -243,30 +243,30 @@ BEGIN
MENUITEM "&Save Rom", MENU_MV_FILE_SAVE MENUITEM "&Save Rom", MENU_MV_FILE_SAVE
MENUITEM "S&ave Rom As...", MENU_MV_FILE_SAVE_AS MENUITEM "S&ave Rom As...", MENU_MV_FILE_SAVE_AS
MENUITEM "&Load *.TBL File", MENU_MV_FILE_LOAD_TBL MENUITEM "&Load *.TBL File", MENU_MV_FILE_LOAD_TBL
MENUITEM "Unload *.TBL file", MENU_MV_FILE_UNLOAD_TBL MENUITEM "&Unload *.TBL file", MENU_MV_FILE_UNLOAD_TBL
POPUP "&Dump to file" POPUP "&Dump to file"
BEGIN BEGIN
MENUITEM "&Ram", MENU_MV_FILE_DUMP_RAM MENUITEM "&Ram", MENU_MV_FILE_DUMP_RAM
MENUITEM "&PPU Memory", MENU_MV_FILE_DUMP_PPU MENUITEM "&PPU Memory", MENU_MV_FILE_DUMP_PPU
END END
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Close\tAlt+F4", ID_MEMWVIEW_FILE_CLOSE MENUITEM "&Close\tAlt+F4", ID_MEMWVIEW_FILE_CLOSE
END END
POPUP "&Edit" POPUP "&Edit"
BEGIN BEGIN
MENUITEM "Undo\tCtrl+Z", MENU_MV_EDIT_UNDO MENUITEM "&Undo\tCtrl+Z", MENU_MV_EDIT_UNDO
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Copy", MENU_MV_EDIT_COPY MENUITEM "&Copy", MENU_MV_EDIT_COPY
MENUITEM "Paste", MENU_MV_EDIT_PASTE MENUITEM "&Paste", MENU_MV_EDIT_PASTE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Find...", MENU_MV_EDIT_FIND MENUITEM "&Find...", MENU_MV_EDIT_FIND
MENUITEM "Find Next", MENU_MV_EDIT_FIND_NEXT MENUITEM "Find &Next", MENU_MV_EDIT_FIND_NEXT
END END
POPUP "&View" POPUP "&View"
BEGIN BEGIN
MENUITEM "NES Memory", MENU_MV_VIEW_RAM, CHECKED MENUITEM "&NES Memory", MENU_MV_VIEW_RAM, CHECKED
MENUITEM "PPU Memory", MENU_MV_VIEW_PPU MENUITEM "&PPU Memory", MENU_MV_VIEW_PPU
MENUITEM "Rom File", MENU_MV_VIEW_ROM MENUITEM "&Rom File", MENU_MV_VIEW_ROM
END END
POPUP "&Bookmarks" POPUP "&Bookmarks"
BEGIN BEGIN
@ -275,32 +275,32 @@ BEGIN
END END
POPUP "Help" POPUP "Help"
BEGIN BEGIN
MENUITEM "Help...", MENU_MV_HELP MENUITEM "&Help...", MENU_MV_HELP
END END
END END
MEMWATCHMENU MENU MEMWATCHMENU MENU
BEGIN BEGIN
POPUP "File " POPUP "&File "
BEGIN BEGIN
MENUITEM "&New...\tCtrl+N", MEMW_FILE_NEW MENUITEM "&New...\tCtrl+N", MEMW_FILE_NEW
MENUITEM "&Open...\tCtrl+O", MEMW_FILE_OPEN MENUITEM "&Open...\tCtrl+O", MEMW_FILE_OPEN
MENUITEM "&Save\tCtrl+S", MEMW_FILE_SAVE MENUITEM "&Save\tCtrl+S", MEMW_FILE_SAVE
MENUITEM "Sa&ve As..\tCtrl+Shift+S", MEMW_FILE_SAVEAS MENUITEM "S&ave As..\tCtrl+Shift+S", MEMW_FILE_SAVEAS
MENUITEM "&Recent", ID_FILE_RECENT MENUITEM "&Recent", ID_FILE_RECENT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Close\tAlt+F4", MEMW_FILE_CLOSE MENUITEM "&Close\tAlt+F4", MEMW_FILE_CLOSE
END END
POPUP "Options" POPUP "&Options"
BEGIN BEGIN
MENUITEM "Load on Startup", MEMW_OPTIONS_LOADSTART MENUITEM "&Load on Startup", MEMW_OPTIONS_LOADSTART
MENUITEM "Load Last File on Startup", MEMW_OPTIONS_LOADLASTFILE MENUITEM "Load Last &File on Startup", MEMW_OPTIONS_LOADLASTFILE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Collapse to 1 column", MEMW_OPTIONS_EXPANDCOLLAPSE MENUITEM "&Collapse to 1 column", MEMW_OPTIONS_EXPANDCOLLAPSE
END END
POPUP "Help" POPUP "&Help"
BEGIN BEGIN
MENUITEM "MemWatch Commands", MEMW_HELP_WCOMMANDS MENUITEM "&MemWatch Commands", MEMW_HELP_WCOMMANDS
END END
END END
@ -308,7 +308,7 @@ TASEDITCONTEXTMENUS MENU
BEGIN BEGIN
POPUP "Stray" POPUP "Stray"
BEGIN BEGIN
MENUITEM "&Insert Frames", MENU_CONTEXT_STRAY_INSERTFRAMES MENUITEM "Insert Frames", MENU_CONTEXT_STRAY_INSERTFRAMES
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Truncate", ID_CONTEXT_STRAY_TRUNCATE MENUITEM "Truncate", ID_CONTEXT_STRAY_TRUNCATE
END END
@ -339,12 +339,12 @@ BEGIN
MENUITEM "Undo savestate", FCEUX_CONTEXT_UNDOSAVESTATE MENUITEM "Undo savestate", FCEUX_CONTEXT_UNDOSAVESTATE
MENUITEM "Rewind to last auto-save", FCEUX_CONTEXT_REWINDTOLASTAUTO MENUITEM "Rewind to last auto-save", FCEUX_CONTEXT_REWINDTOLASTAUTO
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Help....", FCEU_CONTEXT_MOVIEHELP MENUITEM "Help....", FCEU_CONTEXT_MOVIEHELP
END END
POPUP "Game+NoMovie" POPUP "Game+NoMovie"
BEGIN BEGIN
MENUITEM "&Play Movie", FCEUX_CONTEXT_REPLAYMOVIE MENUITEM "Play Movie...", FCEUX_CONTEXT_REPLAYMOVIE
MENUITEM "&Record Movie", FCEUX_CONTEXT_RECORDMOVIE MENUITEM "Record Movie...", FCEUX_CONTEXT_RECORDMOVIE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Undo savestate", FCEUX_CONTEXT_UNDOSAVESTATE MENUITEM "Undo savestate", FCEUX_CONTEXT_UNDOSAVESTATE
MENUITEM "Undo loadstate", FCEUX_CONTEXT_UNDOLOADSTATE MENUITEM "Undo loadstate", FCEUX_CONTEXT_UNDOLOADSTATE
@ -358,7 +358,7 @@ BEGIN
MENUITEM "Open ROM", FCEU_CONTEXT_OPENROM MENUITEM "Open ROM", FCEU_CONTEXT_OPENROM
MENUITEM "Last ROM used", FCEUX_CONTEXT_RECENTROM1 MENUITEM "Last ROM used", FCEUX_CONTEXT_RECENTROM1
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Help....", FCEU_CONTEXT_FCEUHELP MENUITEM "Help....", FCEU_CONTEXT_FCEUHELP
END END
POPUP "Game+Movie+readwrite" POPUP "Game+Movie+readwrite"
BEGIN BEGIN