Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions Vcc.rc
Original file line number Diff line number Diff line change
Expand Up @@ -28,36 +28,36 @@ IDR_MENU MENU
BEGIN
POPUP "&File"
BEGIN
MENUITEM "Run", ID_FILE_RUN
MENUITEM "Save Config", ID_SAVE_CONFIG
MENUITEM "Load Config", ID_FILE_LOAD
MENUITEM "&Run", ID_FILE_RUN
MENUITEM "&Save Config", ID_SAVE_CONFIG
MENUITEM "&Load Config", ID_FILE_LOAD
MENUITEM SEPARATOR
MENUITEM "[F9] Hard Reset", ID_FILE_RESET
MENUITEM "[F5] Soft Reset", ID_FILE_RESET_SFT
MENUITEM "[F7] Pause", ID_PAUSE_EMULATION
MENUITEM "&Hard Reset [F9]", ID_FILE_RESET
MENUITEM "S&oft Reset [F5]", ID_FILE_RESET_SFT
MENUITEM "&Pause [F7]", ID_PAUSE_EMULATION
MENUITEM SEPARATOR
MENUITEM "Exit", ID_FILE_EXIT
MENUITEM "E&xit", ID_FILE_EXIT
END
POPUP "&Edit"
BEGIN
MENUITEM "Copy Text", ID_COPY_TEXT
MENUITEM "Paste Text", ID_PASTE_TEXT
MENUITEM "Paste BASIC Code (Merge)", ID_PASTE_BASIC
MENUITEM "Paste BASIC Code (with NEW)", ID_PASTE_BASIC_NEW
MENUITEM "&Copy Text", ID_COPY_TEXT
MENUITEM "&Paste Text", ID_PASTE_TEXT
MENUITEM "Paste &Merge BASIC code", ID_PASTE_BASIC
MENUITEM "Paste &New BASIC code", ID_PASTE_BASIC_NEW
END
POPUP "C&onfiguration"
BEGIN
MENUITEM "Flip Artifact Colors", ID_FLIP_ARTIFACTS
MENUITEM "Swap Joysticks", ID_SWAP_JOYSTICKS
MENUITEM "&Flip Artifact Colors", ID_FLIP_ARTIFACTS
MENUITEM "&Swap Joysticks", ID_SWAP_JOYSTICKS

MENUITEM SEPARATOR
MENUITEM "Audio", ID_AUDIO_CONFIG
MENUITEM "Cpu", ID_CPU_CONFIG
MENUITEM "Display", ID_DISPLAY_CONFIG
MENUITEM "Keyboard", ID_KEYBOARD_CONFIG
MENUITEM "JoySticks", ID_JOYSTICKS_CONFIG
MENUITEM "Tape", ID_TAPE_CONFIG
MENUITEM "BitBanger", ID_BITBANGER_CONFIG
MENUITEM "&Audio", ID_AUDIO_CONFIG
MENUITEM "&Cpu", ID_CPU_CONFIG
MENUITEM "&Display", ID_DISPLAY_CONFIG
MENUITEM "&Keyboard", ID_KEYBOARD_CONFIG
MENUITEM "&JoySticks", ID_JOYSTICKS_CONFIG
MENUITEM "&Tape", ID_TAPE_CONFIG
MENUITEM "&BitBanger", ID_BITBANGER_CONFIG

END
// Dummy place holder for Cartrige menu, drawn after carts load
Expand All @@ -67,18 +67,18 @@ BEGIN
END
POPUP "&Debugger"
BEGIN
MENUITEM "Memory Display", ID_MEMORY_DISPLAY
MENUITEM "Processor State", ID_PROCESSOR_STATE
MENUITEM "Disassembler", ID_DISASSEMBLER
MENUITEM "Source Debugger", ID_BREAKPOINTS
MENUITEM "MMU Monitor", ID_MMU_MONITOR
MENUITEM "Execution Trace", ID_EXEC_TRACE
MENUITEM "&Memory Display", ID_MEMORY_DISPLAY
MENUITEM "&Processor State", ID_PROCESSOR_STATE
MENUITEM "&Disassembler", ID_DISASSEMBLER
MENUITEM "&Source Debugger", ID_BREAKPOINTS
MENUITEM "MMU M&onitor", ID_MMU_MONITOR
MENUITEM "Execution &Trace", ID_EXEC_TRACE
END
POPUP "&Help", HELP
BEGIN
MENUITEM "About Vcc", IDM_HELP_ABOUT
MENUITEM "Function Keys", IDM_HELP_FUNKEY
MENUITEM "User Guide", IDM_USER_WIKI
MENUITEM "&About Vcc", IDM_HELP_ABOUT
MENUITEM "&Function Keys", IDM_HELP_FUNKEY
MENUITEM "&User Guide", IDM_USER_WIKI
END
END

Expand Down
1 change: 0 additions & 1 deletion libcommon/include/vcc/util/FileOps.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ int CheckPath(char*);
BOOL PathRemoveFileSpec(char*);
BOOL PathRemoveExtension(char*);
char* PathFindExtension(char*);
//DWORD WritePrivateProfileInt(LPCTSTR, LPCTSTR, int, LPCTSTR);
BOOL FilePrintf(HANDLE, const char*, ...);

7 changes: 0 additions & 7 deletions libcommon/src/util/FileOps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,6 @@ char* PathFindExtension(char *Path)
return(&Path[Index+1]);
}

DWORD WritePrivateProfileInt(LPCTSTR SectionName,LPCTSTR KeyName,int KeyValue,LPCTSTR IniFileName)
{
char Buffer[32]="";
sprintf(Buffer,"%i",KeyValue);
return(WritePrivateProfileString(SectionName,KeyName,Buffer,IniFileName));
}

BOOL FilePrintf(HANDLE hFile, const char* fmt, ...)
{
DWORD dummy;
Expand Down
11 changes: 5 additions & 6 deletions pakinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,9 @@ void BuildCartMenu()
//VCC::Util::section_locker lock(gPakMutex);
using VCC::Bus::gVccCartMenu;
gVccCartMenu.clear();
gVccCartMenu.add("Cartridge", 0, MIT_Head);
if (!gActiveCartrige->name().empty()) {
std::string tmp = "Eject " + gActiveCartrige->name();
gVccCartMenu.add(tmp, ControlId(2), MIT_Slave);
std::string tmp = "&Eject " + gActiveCartrige->name();
gVccCartMenu.add(tmp, ControlId(2), MIT_StandAlone);
// Add items from loaded pak
menu_item_entry item;
for (size_t index=0;index<MAX_MENU_ITEMS;index++) {
Expand All @@ -194,9 +193,9 @@ void BuildCartMenu()
}
}
} else {
gVccCartMenu.add("Load MPI", ControlId(3), MIT_Slave);
gVccCartMenu.add("Load DLL", ControlId(1), MIT_Slave);
gVccCartMenu.add("Load ROM", ControlId(4), MIT_Slave);
gVccCartMenu.add("Load &MPI", ControlId(3), MIT_StandAlone);
gVccCartMenu.add("Load &DLL", ControlId(1), MIT_StandAlone);
gVccCartMenu.add("Load &ROM", ControlId(4), MIT_StandAlone);
}
}

Expand Down