From bb1fc08d8e0a0753992db54aa9a067078b9feb42 Mon Sep 17 00:00:00 2001 From: zeromus Date: Thu, 4 Aug 2022 21:23:34 -0400 Subject: [PATCH] rename all iNES Header Editor to NES Header Editor (re #519) --- src/drivers/Qt/ConsoleWindow.cpp | 8 ++++---- src/drivers/Qt/HexEditor.cpp | 2 +- src/drivers/Qt/iNesHeaderEditor.cpp | 16 ++++++++-------- src/drivers/sdl/memview.cpp | 2 +- src/drivers/win/debugger.cpp | 2 +- src/drivers/win/header_editor.cpp | 16 ++++++++-------- src/drivers/win/memview.cpp | 4 ++-- src/drivers/win/window.cpp | 4 ++-- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/drivers/Qt/ConsoleWindow.cpp b/src/drivers/Qt/ConsoleWindow.cpp index 02ad1059..9332dac4 100644 --- a/src/drivers/Qt/ConsoleWindow.cpp +++ b/src/drivers/Qt/ConsoleWindow.cpp @@ -1730,10 +1730,10 @@ void consoleWin_t::createMainMenu(void) debugMenu->addAction(ggEncodeAct); - // Debug -> iNES Header Editor - iNesEditAct = new QAction(tr("&iNES Header Editor..."), this); + // Debug -> NES Header Editor + iNesEditAct = new QAction(tr("NES Header Edito&r..."), this); //iNesEditAct->setShortcut( QKeySequence(tr("Shift+F7"))); - iNesEditAct->setStatusTip(tr("Open iNES Header Editor")); + iNesEditAct->setStatusTip(tr("Open NES Header Editor")); connect(iNesEditAct, SIGNAL(triggered()), this, SLOT(openNesHeaderEditor(void)) ); debugMenu->addAction(iNesEditAct); @@ -3055,7 +3055,7 @@ void consoleWin_t::openNesHeaderEditor(void) { iNesHeaderEditor_t *win; - //printf("Open iNES Header Editor Window\n"); + //printf("Open NES Header Editor Window\n"); win = new iNesHeaderEditor_t(this); diff --git a/src/drivers/Qt/HexEditor.cpp b/src/drivers/Qt/HexEditor.cpp index 8335ca7c..ed78bf07 100644 --- a/src/drivers/Qt/HexEditor.cpp +++ b/src/drivers/Qt/HexEditor.cpp @@ -374,7 +374,7 @@ static int writeMem( int mode, unsigned int addr, int value ) { if (addr < 16) { - fprintf( stdout, "You can't edit ROM header here, however you can use iNES Header Editor to edit the header if it's an iNES format file."); + fprintf( stdout, "You can't edit ROM header here, however you can use NES Header Editor to edit the header if it's an iNES or NES2.0 format file."); } else if ( (addr >= 16) && (addr < PRGsize[0]+16) ) { diff --git a/src/drivers/Qt/iNesHeaderEditor.cpp b/src/drivers/Qt/iNesHeaderEditor.cpp index 9342a002..47b435b6 100644 --- a/src/drivers/Qt/iNesHeaderEditor.cpp +++ b/src/drivers/Qt/iNesHeaderEditor.cpp @@ -189,7 +189,7 @@ iNesHeaderEditor_t::iNesHeaderEditor_t(QWidget *parent) fontCharWidth = fm.width(QLatin1Char('2')); #endif - setWindowTitle("iNES Header Editor"); + setWindowTitle("NES Header Editor"); //resize( 512, 512 ); @@ -197,7 +197,7 @@ iNesHeaderEditor_t::iNesHeaderEditor_t(QWidget *parent) hdrLayout = new QVBoxLayout(); hbox1 = new QHBoxLayout(); hbox = new QHBoxLayout(); - hdrBox = new QGroupBox( tr("iNES Header") ); + hdrBox = new QGroupBox( tr("NES Header") ); box = new QGroupBox( tr("Version:") ); mainLayout->addWidget( hdrBox ); @@ -550,7 +550,7 @@ iNesHeaderEditor_t::~iNesHeaderEditor_t(void) //---------------------------------------------------------------------------- void iNesHeaderEditor_t::closeEvent(QCloseEvent *event) { - //printf("iNES Header Editor Close Window Event\n"); + //printf("NES Header Editor Close Window Event\n"); done(0); deleteLater(); event->accept(); @@ -701,21 +701,21 @@ bool iNesHeaderEditor_t::loadHeader(iNES_HEADER* header) break; } case errors::INVALID_HEADER: - //MessageBox(parent, "Invalid iNES header.", "iNES Header Editor", MB_OK | MB_ICONERROR); - showErrorMsgWindow( "Invalid iNES header." ); + //MessageBox(parent, "Invalid NES header.", "NES Header Editor", MB_OK | MB_ICONERROR); + showErrorMsgWindow( "Invalid NES header." ); break; case errors::FDS_HEADER: - //MessageBox(parent, "Editing header of an FDS file is not supported.", "iNES Header Editor", MB_OK | MB_ICONERROR); + //MessageBox(parent, "Editing header of an FDS file is not supported.", "NES Header Editor", MB_OK | MB_ICONERROR); showErrorMsgWindow("Editing header of an FDS file is not supported."); break; case errors::UNIF_HEADER: - //MessageBox(parent, "Editing header of a UNIF file is not supported.", "iNES Header Editor", MB_OK | MB_ICONERROR); + //MessageBox(parent, "Editing header of a UNIF file is not supported.", "NES Header Editor", MB_OK | MB_ICONERROR); showErrorMsgWindow("Editing header of a UNIF file is not supported."); break; case errors::NSF_HEADER: // case errors::NSF2_HEADER: // case errors::NSFE_HEADER: - //MessageBox(parent, "Editing header of an NSF file is not supported.", "iNES Header Editor", MB_OK | MB_ICONERROR); + //MessageBox(parent, "Editing header of an NSF file is not supported.", "NES Header Editor", MB_OK | MB_ICONERROR); showErrorMsgWindow("Editing header of an NSF file is not supported."); break; } diff --git a/src/drivers/sdl/memview.cpp b/src/drivers/sdl/memview.cpp index c89dbf3c..bc17ee3d 100644 --- a/src/drivers/sdl/memview.cpp +++ b/src/drivers/sdl/memview.cpp @@ -277,7 +277,7 @@ struct memViewWin_t { if (addr < 16) { - fprintf( stdout, "You can't edit ROM header here, however you can use iNES Header Editor to edit the header if it's an iNES format file."); + fprintf( stdout, "You can't edit ROM header here, however you can use NES Header Editor to edit the header if it's an iNES or NES2.0 format file."); } else if ( (addr >= 16) && (addr < PRGsize[0]+16) ) { diff --git a/src/drivers/win/debugger.cpp b/src/drivers/win/debugger.cpp index 4bc61e5b..8c3156a2 100644 --- a/src/drivers/win/debugger.cpp +++ b/src/drivers/win/debugger.cpp @@ -1471,7 +1471,7 @@ INT_PTR CALLBACK PatcherCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa else iapoffset = GetNesFileAddress(GetEditHex(hwndDlg,IDC_ROMPATCHER_OFFSET)); if((iapoffset < 16) && (iapoffset != -1)){ - MessageBox(hDebug, "Sorry, iNES Header editing isn't supported by this tool. If you want to edit the header, please use iNES Header Editor", "Error", MB_OK | MB_ICONASTERISK); + MessageBox(hDebug, "Sorry, NES Header editing isn't supported by this tool. If you want to edit the header, please use NES Header Editor", "Error", MB_OK | MB_ICONASTERISK); iapoffset = -1; } if((iapoffset > PRGsize[0]) && (iapoffset != -1)){ diff --git a/src/drivers/win/header_editor.cpp b/src/drivers/win/header_editor.cpp index 8893b7d9..168a6170 100644 --- a/src/drivers/win/header_editor.cpp +++ b/src/drivers/win/header_editor.cpp @@ -186,22 +186,22 @@ bool LoadHeader(HWND parent, iNES_HEADER* header) { char buf[1024]; sprintf(buf, "Error opening %s!", LoadedRomFName); - MessageBox(parent, buf, "iNES Header Editor", MB_OK | MB_ICONERROR); + MessageBox(parent, buf, "NES Header Editor", MB_OK | MB_ICONERROR); break; } case errors::INVALID_HEADER: - MessageBox(parent, "Invalid iNES header.", "iNES Header Editor", MB_OK | MB_ICONERROR); + MessageBox(parent, "Invalid NES header.", "NES Header Editor", MB_OK | MB_ICONERROR); break; case errors::FDS_HEADER: - MessageBox(parent, "Editing header of an FDS file is not supported.", "iNES Header Editor", MB_OK | MB_ICONERROR); + MessageBox(parent, "Editing header of an FDS file is not supported.", "NES Header Editor", MB_OK | MB_ICONERROR); break; case errors::UNIF_HEADER: - MessageBox(parent, "Editing header of a UNIF file is not supported.", "iNES Header Editor", MB_OK | MB_ICONERROR); + MessageBox(parent, "Editing header of a UNIF file is not supported.", "NES Header Editor", MB_OK | MB_ICONERROR); break; case errors::NSF_HEADER: // case errors::NSF2_HEADER: // case errors::NSFE_HEADER: - MessageBox(parent, "Editing header of an NSF file is not supported.", "iNES Header Editor", MB_OK | MB_ICONERROR); + MessageBox(parent, "Editing header of an NSF file is not supported.", "NES Header Editor", MB_OK | MB_ICONERROR); break; } return false; @@ -1735,7 +1735,7 @@ int GetComboBoxByteSize(HWND hwnd, UINT id, int* value, iNES_HEADER* header) sprintf(buf, "The unit of %s size you entered is invalid, it must be B, KB or MB", name); break; case errors::MINUS_ERR: - sprintf(buf, "Negative value of %s is not supported by iNES header.", name); + sprintf(buf, "Negative value of %s is not supported by NES header.", name); break; } @@ -1880,7 +1880,7 @@ bool SaveINESFile(HWND hwnd, char* path, iNES_HEADER* header) if (!source) { sprintf(buf, "Opening source file %s failed.", LoadedRomFName); - MessageBox(hwnd, buf, "iNES Header Editor", MB_OK | MB_ICONERROR); + MessageBox(hwnd, buf, "NES Header Editor", MB_OK | MB_ICONERROR); return false; } @@ -1889,7 +1889,7 @@ bool SaveINESFile(HWND hwnd, char* path, iNES_HEADER* header) if (!target) { sprintf(buf, "Creating target file %s failed.", path); - MessageBox(hwnd, buf, "iNES Header Editor", MB_OK | MB_ICONERROR); + MessageBox(hwnd, buf, "NES Header Editor", MB_OK | MB_ICONERROR); FCEU_fclose(source); return false; } diff --git a/src/drivers/win/memview.cpp b/src/drivers/win/memview.cpp index 0eb55579..7c8af67d 100644 --- a/src/drivers/win/memview.cpp +++ b/src/drivers/win/memview.cpp @@ -346,7 +346,7 @@ static int GetFileData(uint32 offset){ } static int WriteFileData(uint32 addr,int data){ - if (addr < 16) MessageBox(hMemView, "You can't edit ROM header here, however you can use iNES Header Editor to edit the header if it's an iNES format file.", "Sorry", MB_OK | MB_ICONERROR); + if (addr < 16) MessageBox(hMemView, "You can't edit ROM header here, however you can use NES Header Editor to edit the header if it's an iNES format file.", "Sorry", MB_OK | MB_ICONERROR); if((addr >= 16) && (addr < PRGsize[0]+16)) *(uint8 *)(GetNesPRGPointer(addr-16)) = data; if((addr >= PRGsize[0]+16) && (addr < CHRsize[0]+PRGsize[0]+16)) *(uint8 *)(GetNesCHRPointer(addr-16-PRGsize[0])) = data; @@ -736,7 +736,7 @@ void UpdateColorTable() int temp_offset; for (i = 0; i < DataAmount; i++) { - temp_offset = CurOffset + i - 16; // (minus iNES header) + temp_offset = CurOffset + i - 16; // (minus NES header) if (temp_offset >= 0) { if ((unsigned int)temp_offset < cdloggerdataSize) diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index b36e74bc..d2ba531e 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -404,7 +404,7 @@ void updateGameDependentMenus() for (unsigned int i = 0; i < sizeof(menu_ids) / sizeof(*menu_ids); i++) EnableMenuItem(fceumenu, menu_ids[i], MF_BYCOMMAND | enable ? MF_ENABLED : MF_GRAYED | MF_DISABLED); - // Special treatment for the iNES head editor, only when no game is loaded or an NES game is loaded + // Special treatment for the NES header editor, only when no game is loaded or an NES game is loaded extern iNES_HEADER head; enable = GameInfo == 0 || !strncmp((const char*)&head, "NES\x1A", 4); EnableMenuItem(fceumenu, MENU_INESHEADEREDITOR, MF_BYCOMMAND | enable ? MF_ENABLED : MF_GRAYED | MF_DISABLED); @@ -3394,7 +3394,7 @@ bool inline (*GetIsLetterLegal(UINT id))(char letter) case IDC_CHEAT_TEXT: return IsLetterLegalCheat; - // PRG ROM, PRG RAM, PRG NVRAM, CHR ROM, CHR RAM and CHR NVRAM in iNES Header Editor + // PRG ROM, PRG RAM, PRG NVRAM, CHR ROM, CHR RAM and CHR NVRAM in NES Header Editor case IDC_PRGROM_EDIT: case IDC_PRGRAM_EDIT: case IDC_PRGNVRAM_EDIT: case IDC_CHRROM_EDIT: case IDC_CHRRAM_EDIT: case IDC_CHRNVRAM_EDIT: return IsLetterLegalSize;