Merge pull request #2056 from oddMLan/misc-gui-fixes

Minor GUI improvements (merge this first)
This commit is contained in:
zilmar 2021-05-28 15:28:19 +09:30 committed by GitHub
commit 84166f49ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 251 additions and 279 deletions

View File

@ -1,32 +1,15 @@
/*********************************************************************************
* Meta Information *
*********************************************************************************/
//About DLL
#1 # "English" // LANGUAGE ID
// Meta information
#1 # "English" // Language ID
#2 # "Zilmar" // Author
#3 # "3.0" // Version
#4 # "November, 2020" // Date
#4 # "May, 2021" // Date
//About DLL Dialog
#5 # "Current Language"
#6 # "Author"
#7 # "Version"
#8 # "Date"
#9 # "Visit Home Page"
#10 # "ROM Database (.RDB)"
#11 # "Cheat Code File (.CHT)"
#12 # "Extended ROM Info (.RDX)"
/*** Menu ***/
//About INI title
#20 # "About Config Files"
/*********************************************************************************
* Menu *
*********************************************************************************/
//File Menu
// File menu
#100# "&File"
#101# "&Open ROM"
#102# "ROM &Info...."
#102# "ROM &Info..."
#103# "Start Emulation"
#104# "&End Emulation"
#105# "Choose ROM Directory..."
@ -36,51 +19,50 @@
#109# "E&xit"
#110# "Open &Combo"
//System Menu
// System menu
#120# "&System"
#121# "&Reset"
#122# "&Pause"
#123# "Generate Bitmap"
#123# "Capture screenshot"
#124# "Limit FPS"
#125# "&Save State"
#126# "Save As..."
#127# "&Load State"
#128# "Load..."
#129# "Current Save S&tate"
#130# "Cheats..."
#129# "Current Saves&tate"
#130# "&Cheats..."
#131# "GS Button"
#132# "R&esume"
#133# "&Soft Reset"
#134# "&Hard Reset"
#135# "Swap &Disk"
#136# "Enhancement..."
#136# "&Enhancements..."
//Options Menu
// Options menu
#140# "&Options"
#141# "&Full Screen"
#142# "&Always on &Top"
#143# "Configure Graphics Plugin..."
#144# "Configure Audio Plugin..."
#145# "Configure Controller Plugin..."
#146# "Configure RSP Plugin..."
#147# "Show CPU Usage"
#148# "&Settings..."
#141# "&Fullscreen"
#142# "Always on &top"
#143# "&Graphics Settings"
#144# "&Audio Settings"
#145# "&Input Settings"
#146# "&RSP Settings"
#147# "Show CPU &Stats"
#148# "Configura&tion"
//Debugger Menu
// Debugger menu
#160# "&Debugger"
//Language Menu
// Language menu
#175# "&Language"
//Help Menu
// Help menu
#180# "&Help"
#182# "&About Project64"
#183# "Support &Forum"
#184# "&Website"
#185# "&Support Project64"
#186# "&Discord"
//Current Save Slot menu
// Current save slot menu
#190# "Default"
#191# "Slot 1"
#192# "Slot 2"
@ -92,17 +74,18 @@
#198# "Slot 8"
#199# "Slot 9"
#200# "Slot 10"
#201# "Save Slot (%ws) selected"
#201# "Save slot (%ws) selected"
//Pop up Menu
// Pop-up menu
#210# "Play Game"
#211# "ROM Information"
#212# "Edit Game Settings"
#213# "Edit Cheats"
#213# "Edit Cheats..."
#214# "Graphics Plugin"
#215# "Play Game with Disk"
#216# "Pick Enhancements..."
//Alternate Name to save Slot
// Alternate name to save slot
#220# "Save Slot - Default"
#221# "Save Slot - 1"
#222# "Save Slot - 2"
@ -115,7 +98,7 @@
#229# "Save Slot - 9"
#230# "Save Slot - 10"
// Menu Descriptions
// Menu descriptions
#250# "Open a N64 ROM image"
#251# "Display information about the loaded image"
#252# "Start emulation of the loaded ROM image"
@ -154,10 +137,9 @@
#285# "Edit settings for selected game"
#286# "Edit cheats for selected game"
/*********************************************************************************
* ROM Browser *
*********************************************************************************/
//ROM Browser Fields
/*** ROM browser ***/
// ROM browser fields
#300# "File Name"
#301# "Internal Name"
#302# "Good Name"
@ -180,34 +162,33 @@
#319# "File Format"
#321# "Name"
//Select ROM
// Select ROM
#320# "Select current ROM directory"
//Messages
// Messages
#340# "Bad ROM? Use GoodN64 & check that the RDB is up-to-date."
/*********************************************************************************
* Options *
*********************************************************************************/
//Options Title
#400# "Settings"
/*** Options ***/
//Tabs
// Options title
#400# "Configuration"
// Tabs
#401# "Plugins"
#402# "Directories"
#403# "Options"
#404# "ROM Selection"
#403# "General settings"
#404# "ROM browser"
#405# "Advanced"
#406# "General Settings"
#407# "Shell Integration"
#406# "ROM settings"
#408# "Notes"
#409# "Keyboard Shortcuts"
#409# "Hotkeys"
#410# "Status"
#411# "Recompiler"
#412# "Defaults"
#413# "64DD"
#414# "64DD"
//Plugin Dialog
// Plugin dialog
#420# "About"
#421# " RSP (Reality Signal Processor) plugin: "
#422# " Video (graphics) plugin: "
@ -217,7 +198,7 @@
#426# "Audio HLE"
#427# "** Use System Plugin **"
//Directory Dialog
// Directory dialog
#440# " Plugin directory: "
#441# " ROM directory: "
#442# " N64 native saves directory: "
@ -232,25 +213,26 @@
#451# " Texture pack directory: "
#452# "Select texture pack directory"
//Options (general) Tab
// Options (general) tab
#460# "Pause emulation when window is not active"
#461# "Enter full-screen mode when loading a ROM"
#461# "Enter fullscreen mode when loading a ROM"
#462# "Hide advanced settings"
#463# "Remember selected cheats"
#464# "Disable screen saver when running a ROM"
#464# "Disable screensaver when running a ROM"
#465# "Display speed"
#466# "Speed display:"
#467# "Check if Project64 is already running"
#468# "Unique Game Save Directory"
#469# "Japanese Retail 64DD IPL ROM Path:"
#470# "American Retail 64DD IPL ROM Path:"
#471# "Development 64DD IPL ROM Path:"
#472# "Disk Save Type:"
#473# "Enable Enhancements"
#474# "Show Status Bar"
#475# "Exit full screen on lose focus"
#468# "Store game saves in separate folders"
#469# "Japanese retail 64DD IPL ROM path:"
#470# "American retail 64DD IPL ROM path:"
#471# "Development 64DD IPL ROM path:"
#472# "Disk save type:"
#473# "Enable enhancements"
#474# "Show status bar"
#475# "Exit fullscreen on lose focus"
#476# "Enable Discord Rich Presence"
//ROM Browser Tab
// ROM browser tab
#480# "Max # of ROMs remembered (0-10):"
#481# "ROMs"
#482# "Max # of ROM dirs remembered (0-10):"
@ -265,7 +247,7 @@
#491# "Down"
#492# "Automatically refresh browser"
//Advanced Options
// Advanced options
#500# "Most of these changes will not take effect until a new ROM is opened or current ROM is reset."
#501# "Core Defaults"
#502# "CPU core style:"
@ -281,8 +263,9 @@
#512# "Start changed"
#513# "Protect memory"
#514# "TLB unmapping"
#515# "Always use interpreter core"
//ROM Options
// ROM options
#520# "CPU core style:"
#521# "VI refresh rate:"
#522# "Memory size:"
@ -298,18 +281,18 @@
#532# "RSP audio signal"
#533# "Fixed audio timing"
#534# "Function lookup method:"
#535# "Custom self mod method"
#535# "Custom self-mod method"
#536# "Sync using audio"
#537# "AI count per byte"
#537# "AI count per byte:"
#538# "32-bit engine"
#539# "Delay DP interrupt"
//Core Styles
// Core styles
#540# "Interpreter"
#541# "Recompiler"
#542# "Synchronize cores"
//Self Mod Methods
// Self-mod methods
#560# "None"
#561# "Cache"
#562# "Protect memory"
@ -318,35 +301,32 @@
#565# "Check memory advance"
#566# "Clear code on cache"
//Function Lookup method
// Function lookup method
#570# "Physical lookup table"
#571# "Virtual lookup table"
#572# "Change memory"
//RDRAM Size
// RDRAM size
#580# "4 MB"
#581# "8 MB"
//Advanced Block Linking
// Advanced block linking
#600# "On"
#601# "Off"
//Save Type
// Save type
#620# "Use first-used save type"
#621# "4-kbit EEPROM"
#622# "16-kbit EEPROM"
#623# "SRAM"
#624# "Flash RAM"
//Shell Integration Tab
#640# "File extension association:"
//ROM Notes
// ROM notes
#660# "ROM status:"
#661# "Core note:"
#662# "Plugin note:"
// Accelerator Selector
// Accelerator selector
#680# "CPU state:"
#681# "Menu item:"
#682# "Current keys:"
@ -361,7 +341,7 @@
#691# "Game playing (full-screen)"
#692# "Detect Key"
// Frame Rate Option
// Framerate option
#700# "Vertical interrupts per second"
#701# "Display lists per second"
#702# "Percentage of full speed"
@ -370,23 +350,22 @@
#710# "Increase Game Speed"
#711# "Decrease Game Speed"
//Bottom page buttons
// Bottom page buttons
#720# "Reset Page"
#721# "Reset All"
#722# "Apply"
#723# "Close"
//Disk Save Type
// Disk save type
#730# "Full Disk Copy"
#731# "Save Area Only"
/*********************************************************************************
* ROM Information *
*********************************************************************************/
//ROM Info Title
/*** ROM information ***/
// ROM info title
#800# "ROM Information"
//ROM Info Text
// ROM info text
#801# "ROM name:"
#802# "File name:"
#803# "Location:"
@ -399,17 +378,16 @@
#810# "CIC Chip:"
#811# "MD5:"
/*********************************************************************************
* Cheats *
*********************************************************************************/
//Cheat List
/*** Cheats ***/
// Cheat list
#1000# "Cheats"
#1001# "Cheats:"
#1002# " Notes: "
#1003# "Mark All"
#1004# "Unmark All"
//Add Cheat
// Add cheat
#1005# "Add Cheat"
#1006# "Name:"
#1007# "Code:"
@ -418,13 +396,13 @@
#1010# " Cheat Notes: "
#1011# "Add to DB"
//Code extension
// Code extension
#1012# "Code Extensions"
#1013# "Please choose a value to be used for:"
#1014# "OK"
#1015# "Cancel"
//Digital Value
// Digital value
#1016# "Quantity Digit"
#1017# "Please choose a value for:"
#1018# "&Value"
@ -433,56 +411,53 @@
#1021# "&Notes:"
#1022# "Add Cheat"
#1023# "New Cheat"
#1024# "<address> <value>"
#1024# "<address> <value>:<old>"
#1025# "Options:"
#1026# "<value> <label>"
//Edit Cheat
// Edit cheat
#1027# "Edit Cheat"
#1028# "Update Cheat"
#1029# "Cheat has been changed.\n\nDo you want to update?"
#1030# "Cheat updated"
//Cheat Popup Menu
// Cheat pop-up menu
#1040# "Add New Cheat..."
#1041# "Edit"
#1042# "Delete"
// short-cut editor
#1100# "Reset short-cuts"
#1101# "Are you sure you want to reset the short-cuts?\n\nThis action cannot be undone."
// Shortcut editor
#1100# "Reset shortcuts"
#1101# "Are you sure you want to reset the shortcuts?\n\nThis action cannot be undone."
#1102# "File Menu"
#1103# "System Menu"
#1104# "Options"
#1105# "Save Slots"
/*********************************************************************************
* Support Window *
*********************************************************************************/
/*** Support window ***/
#1200# "Support Project64"
#1201# "Project64 is a free and open source Nintendo64 emulator. This allows you to play real N64 software in much the same way as it would be on the original hardware system.\n\nI am sorry about the inconvenience of this prompt, but you are being asked to wait for a few seconds in order to enjoy the result of hundreds of hours of work.\n\nIf you can and would like to support Project64 or you have gotten some value out of it then please support project64 as either a thank you, or your a desire to see removal of this prompt.\n\nIf you have supported Project64:"
#1201# "Project64 is a free and open source Nintendo 64 emulator.\n\nIt allows you to play real N64 software in much the same way as it would be on the original console.\n\nI am sorry about the inconvenience of this prompt, but you are being asked to wait for a few seconds in order to enjoy the result of hundreds of hours of work.\n\nIf you can and would like to support Project64 or you have gotten some value out of it then please support Project64 as either a thank you, or your desire to remove this prompt.\n\nIf you have supported Project64:"
#1202# "Enter/Request Notification Code"
#1203# "Support Project64"
#1204# "Continue"
#1205# "Please enter the support code"
#1206# "Failed to validate the code\n\nMake sure the code matches in email based on your machine"
#1206# "Failed to validate the code\n\nMake sure the code in email matches based on your machine"
#1207# "Thank you"
#1208# "Please enter your support code"
#1209# "Please enter the code you recieved in the email.\n\nThis email will be sent to the email address used to support project64.\n\nPlease note that the code is will only work for a unique machine. This computer id is:"
#1209# "Please enter the code you recieved in the email.\n\nThis email will be sent to the email address used to support Project64.\n\nPlease note that the code is will only work for a unique machine. This computer ID is:"
#1210# "OK"
#1211# "Cancel"
#1212# "Request Code"
#1213# "Code has been sent to your email"
#1214# "Failed to send code, please make sure it is the email you supported with"
/*********************************************************************************
* Enhancements *
*********************************************************************************/
/*** Enhancements ***/
#1300# "Enhancements"
/*********************************************************************************
* Messages *
*********************************************************************************/
/*** Messages ***/
#2000# "*** CPU PAUSED ***"
#2001# "CPU Resumed"
#2002# "In a permanent loop that cannot be exited.\nEmulation will now stop.\n\nVerify ROM and its settings."
@ -548,9 +523,8 @@
#2063# "Failed to update cheat, it is invalid"
#2064# "Invalid Cheat"
/*********************************************************************************
* Android *
*********************************************************************************/
/*** Android ***/
#3000# "Settings"
#3001# "Help/Forum"
#3002# "Report Issue"
@ -570,11 +544,11 @@
#3016# "Project64 for Android"
#3017# "License"
#3018# "Revision"
#3019# "Project64 for Android\u2122 is a port of the windows version of project64.The Android\u2122 version can play most N64 games."
#3019# "Project64 for Android\u2122 is a port of the windows version of Project64.The Android\u2122 version can play most N64 games."
#3020# "Project64 Authors."
#3021# "Discord"
//In game menu
// In-game menu
#3100# "Settings"
#3101# "Save State"
#3102# "Load State"
@ -589,3 +563,6 @@
#3111# "Debugging Options"
#3112# "Reset Function Times"
#3113# "Dump Function Times"
// Video plugin
#3200# "Native"

View File

@ -5,7 +5,7 @@
#1 # "Español" // LANGUAGE ID
#2 # "MELERIX" // Author
#3 # "2.3.2" // Version
#4 # "16/05/2018" // Date
#4 # "25/06/2021" // Date
//About DLL Dialog
#5 # "Lenguaje Actual"
@ -34,6 +34,8 @@
#107# "ROM Reciente"
#108# "Directorios de ROMs Recientes"
#109# "&Salir"
#110# "Abrir &Combo"
//System Menu
#120# "&Sistema"
@ -52,16 +54,17 @@
#133# "&Reinicio Simple"
#134# "&Reinicio Completo"
#135# "Intercambiar &Disco"
#136# "&Mejoras..."
//Options Menu
#140# "&Opciones"
#141# "&Pantalla Completa"
#142# "&Siempre por Encima"
#143# "Configurar Complemento de Gráficos..."
#144# "Configurar Complemento de Audio..."
#145# "Configurar Complemento de Control..."
#146# "Configurar Complemento de RSP..."
#147# "Mostrar Uso de la CPU"
#143# "Configuración de &Gráficos"
#144# "Configuración de &Audio"
#145# "Configuración de &Controles"
#146# "Configuración de &RSP"
#147# "Mostrar &Uso de CPU"
#148# "&Ajustes..."
//Debugger Menu
@ -72,10 +75,10 @@
//Help Menu
#180# "Ayuda"
#181# "Acerca de los Archivos de Conf&iguración"
#182# "&Acerca de Project64"
#183# "&Foro de Soporte"
#184# "&Pagina Principal"
#184# "&Página Web"
#185# "&Apoyar a Project64"
#186# "&Discord"
//Current Save Slot menu
#190# "Predeterminada"
@ -97,7 +100,8 @@
#212# "Editar Ajustes del Juego"
#213# "Editar Trucos"
#214# "Complemento Gráfico"
#215# "Jugar Juego con Disco"
#215# "Jugar con Disco"
#216# "Elegir Mejoras..."
//Alternate Name to save Slot
#220# "Ranura de Guardado - Predeterminada"
@ -236,8 +240,15 @@
#465# "Mostrar velocidad"
#466# "Velocidad de la pantalla:"
#467# "Comprobar si Project64 ya está en ejecución"
#468# "Directorio Único de Guardados de Juego"
#469# "Ruta de ROM 64DD IPL:"
#468# "Almacenar partidas de guardado en carpetas separadas"
#469# "Ruta de ROM 64DD IPL (Japón):"
#470# "Ruta de ROM 64DD IPL (América):"
#471# "Ruta de ROM 64DD IPL (Desarrollador):"
#472# "Tipo de guardado de disco:"
#473# "Habilitar mejoras"
#474# "Mostrar barra de estado"
#475# "Salir de pantalla completa al perder foco"
#476# "Habilitar Discord Rich Presence"
//ROM Browser Tab
#480# "Máx # de ROMs recordadas (0-10):"
@ -258,7 +269,7 @@
#500# "La mayoría de estos cambios no tendrán efecto hasta que una nueva ROM sea abierta o la ROM actual sea reiniciada."
#501# "Predeterminados del Núcleo"
#502# "Estilo de núcleo de la CPU:"
#503# "Métodos self mod:"
#503# "Métodos <self-mod>:"
#504# "Tamaño de memoria predeterminado:"
#505# "Vinculación avanzada de bloques"
#506# "Iniciar emulación cuando la ROM sea abierta"
@ -270,6 +281,7 @@
#512# "Inicio cambiado"
#513# "Proteger memoria"
#514# "TLB no mapeado"
#515# "Siempre usar núcleo interpretador"
//ROM Options
#520# "Estilo de núcleo de la CPU:"
@ -418,7 +430,7 @@
#1021# "&Notas:"
#1022# "Agregar Truco"
#1023# "Nuevo Truco"
#1024# "<dirección> <valor>"
#1024# "<dirección> <valor>:<ant.>"
#1025# "Opciones:"
#1026# "<valor> <etiqueta>"
@ -445,17 +457,25 @@
* Support Window *
*********************************************************************************/
#1200# "Apoya a Project64"
#1201# "Project64 es un paquete de software diseñado para emular un sistema de videojuegos Nintendo64 en un PC basado en Microsoft Windows. Esto te permite jugar con software real de N64 de la misma manera como lo sería en el sistema de hardware original.\n\nSi te gusta Project64 y has conseguido algún valor fuera de este, entonces por favor apoya a project64 como muestra de agradecimiento, o tu deseo de ver que esto sea continuamente mejorado.\n\nSi has apoyado a project64:"
#1201# "Project64 es un emulador de la Nintendo 64 gratuito y de código abierto.\n\nTe permite jugar con software real de N64 de la misma manera como lo sería en la consola original.\n\nDisculpa la inconveniencia de este mensaje, pero te pido esperar tan solo unos segunditos para disfrutar del resultado de cientos de horas de esfuerzo.\n\nSi puedes y quieres apoyar a Project64 o has obtenido algún valor de éste, entonces por favor apoya a Project64 ya sea como muestra de agradecimiento, o tu deseo de quitar este mensaje.\n\nSi has apoyado a Project64:"
#1202# "Introduce el código de notificación"
#1203# "Apoya a Project64"
#1204# "Continuar"
#1205# "Por favor introduce el código de apoyo"
#1206# "Código de apoyo incorrecto"
#1206# "Error al validar el código.\n\nAsegúrate que el código en el correo coincida con el correspondiente a tu computadora."
#1207# "Gracias"
#1208# "Introduce el código"
#1209# "Por favor introduce el código del email"
#1209# "Por favor introduce el código que recibiste en tu correo.\n\nEl correo será enviado a la cuenta que se usó para apoyar a Project64.\n\nComprenda que el código solo funcionará para una única computadora. El ID de esta computadora es:"
#1210# "Aceptar"
#1211# "Cancelar"
#1213# "El código fue enviado a tu correo"
#1214# "Fallo al enviar código, por favor asegúrate que este sea el correo con el que apoyaste a Project64"
/*** Enhancements ***/
#1300# "Mejoras"
/*********************************************************************************
* Messages *

View File

@ -183,7 +183,7 @@ enum LanguageStringID
RB_NOTES_PLUGIN = 306,
RB_NOTES_USER = 307,
RB_CART_ID = 308,
RB_MANUFACTUER = 309,
RB_MEDIA = 309,
RB_COUNTRY = 310,
RB_DEVELOPER = 311,
RB_CRC1 = 312,
@ -266,6 +266,7 @@ enum LanguageStringID
OPTION_ENABLE_ENHANCEMENTS = 473,
OPTION_SHOW_STATUS_BAR = 474,
OPTION_EXIT_FULLSCREEN_ON_LOSE_FOCUS = 475,
OPTION_DISCORD_RPC = 476,
// ROM browser tab
RB_MAX_ROMS = 480,
@ -299,6 +300,7 @@ enum LanguageStringID
ADVANCE_SMM_VALIDATE = 512,
ADVANCE_SMM_PROTECT = 513,
ADVANCE_SMM_TLB = 514,
ADVANCE_ALWAYS_INTERPRETER = 515,
// ROM options
ROM_CPU_STYLE = 520,
@ -324,7 +326,6 @@ enum LanguageStringID
ROM_OVER_CLOCK_MODIFIER = 5400,
ROM_UNALIGNED_DMA = 5410,
ROM_RANDOMIZE_SIPI_INTERRUPTS = 5420,
ROM_MEM_SIZE_NOTE = 5430,
ROM_DISK_SEEK_TIMING = 5440,
ROM_DISK_SEEK_TIMING_TURBO = 5441,
ROM_DISK_SEEK_TIMING_SLOW = 5442,

View File

@ -12,28 +12,9 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(EMPTY_STRING, "");
// Meta information
// About DLL
DEF_STR(LANGUAGE_NAME, "");
DEF_STR(LANGUAGE_AUTHOR, "");
DEF_STR(LANGUAGE_VERSION, "");
DEF_STR(LANGUAGE_DATE, "");
// About DLL dialog
DEF_STR(INI_CURRENT_LANG, "Current Language");
DEF_STR(INI_AUTHOR, "Author");
DEF_STR(INI_VERSION, "Version");
DEF_STR(INI_DATE, "Date");
DEF_STR(INI_HOMEPAGE, "Visit Home Page");
DEF_STR(INI_CURRENT_RDB, "ROM Database (.RDB)");
DEF_STR(INI_CURRENT_CHT, "Cheat Code File (.CHT)");
DEF_STR(INI_CURRENT_RDX, "Extended ROM Info (.RDX)");
// About INI title
DEF_STR(INI_TITLE, "About Config Files");
// Numbers
DEF_STR(NUMBER_0, "0");
DEF_STR(NUMBER_1, "1");
DEF_STR(NUMBER_2, "2");
@ -45,12 +26,12 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(NUMBER_8, "8");
DEF_STR(NUMBER_9, "9");
// Menu
/*** Menu ***/
// File menu
DEF_STR(MENU_FILE, "&File");
DEF_STR(MENU_OPEN, "&Open ROM");
DEF_STR(MENU_ROM_INFO, "ROM &Info....");
DEF_STR(MENU_ROM_INFO, "ROM &Info...");
DEF_STR(MENU_START, "Start Emulation");
DEF_STR(MENU_END, "&End Emulation");
DEF_STR(MENU_CHOOSE_ROM, "Choose ROM Directory...");
@ -64,31 +45,31 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(MENU_SYSTEM, "&System");
DEF_STR(MENU_RESET, "&Reset");
DEF_STR(MENU_PAUSE, "&Pause");
DEF_STR(MENU_BITMAP, "Generate Bitmap");
DEF_STR(MENU_BITMAP, "Capture screenshot");
DEF_STR(MENU_LIMIT_FPS, "Limit FPS");
DEF_STR(MENU_SAVE, "&Save State");
DEF_STR(MENU_SAVE_AS, "Save As...");
DEF_STR(MENU_RESTORE, "&Load State");
DEF_STR(MENU_LOAD, "Load...");
DEF_STR(MENU_CURRENT_SAVE, "Current Save S&tate");
DEF_STR(MENU_CHEAT, "Cheats...");
DEF_STR(MENU_CURRENT_SAVE, "Current Saves&tate");
DEF_STR(MENU_CHEAT, "&Cheats...");
DEF_STR(MENU_GS_BUTTON, "GS Button");
DEF_STR(MENU_RESUME, "R&esume");
DEF_STR(MENU_RESET_SOFT, "&Soft Reset");
DEF_STR(MENU_RESET_HARD, "&Hard Reset");
DEF_STR(MENU_SWAPDISK, "Swap &Disk");
DEF_STR(MENU_ENHANCEMENT, "Enhancement...");
DEF_STR(MENU_ENHANCEMENT, "&Enhancements...");
// Options menu
DEF_STR(MENU_OPTIONS, "&Options");
DEF_STR(MENU_FULL_SCREEN, "&Full Screen");
DEF_STR(MENU_ON_TOP, "&Always on &Top");
DEF_STR(MENU_CONFG_GFX, "Configure Graphics Plugin...");
DEF_STR(MENU_CONFG_AUDIO, "Configure Audio Plugin...");
DEF_STR(MENU_CONFG_CTRL, "Configure Controller Plugin...");
DEF_STR(MENU_CONFG_RSP, "Configure RSP Plugin...");
DEF_STR(MENU_SHOW_CPU, "Show CPU Usage");
DEF_STR(MENU_SETTINGS, "&Settings...");
DEF_STR(MENU_FULL_SCREEN, "&Fullscreen");
DEF_STR(MENU_ON_TOP, "&Always on &top");
DEF_STR(MENU_CONFG_GFX, "&Graphic Settings");
DEF_STR(MENU_CONFG_AUDIO, "&Audio Settings");
DEF_STR(MENU_CONFG_CTRL, "&Input Settings");
DEF_STR(MENU_CONFG_RSP, "&RSP Settings");
DEF_STR(MENU_SHOW_CPU, "Show CPU &Stats");
DEF_STR(MENU_SETTINGS, "Configura&tion");
// Debugger menu
DEF_STR(MENU_DEBUGGER, "&Debugger");
@ -123,8 +104,8 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(POPUP_SETTINGS, "Edit Game Settings");
DEF_STR(POPUP_CHEATS, "Edit Cheats");
DEF_STR(POPUP_GFX_PLUGIN, "Graphics Plugin");
DEF_STR(POPUP_PLAYDISK, "Play Game with Disk");
DEF_STR(POPUP_ENHANCEMENTS, "Choose Enhancement");
DEF_STR(POPUP_PLAYDISK, "Play Game with Disk");
DEF_STR(POPUP_ENHANCEMENTS, "Pick Enhancements");
// Alternate name to save slot
DEF_STR(SAVE_SLOT_DEFAULT, "Save Slot - Default");
@ -139,20 +120,19 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(SAVE_SLOT_9, "Save Slot - 9");
DEF_STR(SAVE_SLOT_10, "Save Slot - 10");
// ROM browser
/*** ROM browser ***/
// ROM browser fields
DEF_STR(RB_FILENAME, "File Name");
DEF_STR(RB_INTERNALNAME, "Internal Name");
DEF_STR(RB_GOODNAME, "Good Name");
DEF_STR(RB_NAME, "Name");
DEF_STR(RB_STATUS, "Status");
DEF_STR(RB_ROMSIZE, "ROM Size");
DEF_STR(RB_NOTES_CORE, "Notes (core)");
DEF_STR(RB_NOTES_PLUGIN, "Notes (default plugins)");
DEF_STR(RB_NOTES_USER, "Notes (user)");
DEF_STR(RB_CART_ID, "Cartridge ID");
DEF_STR(RB_MANUFACTUER, "Media");
DEF_STR(RB_MEDIA, "Media Type");
DEF_STR(RB_COUNTRY, "Country");
DEF_STR(RB_DEVELOPER, "Developer");
DEF_STR(RB_CRC1, "CRC1");
@ -163,6 +143,7 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(RB_PLAYERS, "Players");
DEF_STR(RB_FORCE_FEEDBACK, "Force Feedback");
DEF_STR(RB_FILE_FORMAT, "File Format");
DEF_STR(RB_NAME, "Name");
// Select ROM
DEF_STR(SELECT_ROM_DIR, "Select current ROM directory");
@ -170,21 +151,20 @@ void CLanguage::LoadDefaultStrings(void)
// Messages (TODO: GoodN64 is no longer maintained and perhaps should be replaced with references to something else?)
DEF_STR(RB_NOT_GOOD_FILE, "Bad ROM? Use GoodN64 & check that the RDB is up-to-date.");
// Options
/*** Options ***/
// Options title
DEF_STR(OPTIONS_TITLE, "Settings");
DEF_STR(OPTIONS_TITLE, "Configura&tion");
// Tabs
DEF_STR(TAB_PLUGIN, "Plugins");
DEF_STR(TAB_DIRECTORY, "Directories");
DEF_STR(TAB_OPTIONS, "Options");
DEF_STR(TAB_ROMSELECTION, "ROM Selection");
DEF_STR(TAB_OPTIONS, "General settings");
DEF_STR(TAB_ROMSELECTION, "ROM browser");
DEF_STR(TAB_ADVANCED, "Advanced");
DEF_STR(TAB_ROMSETTINGS, "General Settings");
DEF_STR(TAB_SHELLINTERGATION, "Shell Integration");
DEF_STR(TAB_ROMSETTINGS, "ROM settings");
DEF_STR(TAB_ROMNOTES, "Notes");
DEF_STR(TAB_SHORTCUTS, "Keyboard Shortcuts");
DEF_STR(TAB_SHORTCUTS, "Hotkeys");
DEF_STR(TAB_ROMSTATUS, "Status");
DEF_STR(TAB_RECOMPILER, "Recompiler");
DEF_STR(TAB_DEFAULTS, "Defaults");
@ -221,18 +201,19 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(OPTION_AUTO_FULLSCREEN, "Enter full-screen mode when loading a ROM");
DEF_STR(OPTION_BASIC_MODE, "Hide advanced settings");
DEF_STR(OPTION_REMEMBER_CHEAT, "Remember selected cheats");
DEF_STR(OPTION_DISABLE_SS, "Disable screen saver when running a ROM");
DEF_STR(OPTION_DISABLE_SS, "Disable screensaver when running a ROM");
DEF_STR(OPTION_DISPLAY_FR, "Display speed");
DEF_STR(OPTION_CHECK_RUNNING, "Check if Project64 is already running");
DEF_STR(OPTION_UNIQUE_SAVE_DIR, "Unique Game Save Directory");
DEF_STR(OPTION_UNIQUE_SAVE_DIR, "Store game saves in separate folders");
DEF_STR(OPTION_CHANGE_FR, "Speed display:");
DEF_STR(OPTION_IPL_ROM_PATH, "Japanese Retail 64DD IPL ROM Path:");
DEF_STR(OPTION_IPL_ROM_USA_PATH, "American Retail 64DD IPL ROM Path:");
DEF_STR(OPTION_IPL_ROM_TOOL_PATH, "Development 64DD IPL ROM Path:");
DEF_STR(OPTION_DISKSAVETYPE, "Disk Save Type:");
DEF_STR(OPTION_ENABLE_ENHANCEMENTS, "Enable Enhancements");
DEF_STR(OPTION_SHOW_STATUS_BAR, "Show Status Bar");
DEF_STR(OPTION_EXIT_FULLSCREEN_ON_LOSE_FOCUS, "Exit full screen on lose focus");
DEF_STR(OPTION_IPL_ROM_PATH, "Japanese retail 64DD IPL ROM path:");
DEF_STR(OPTION_IPL_ROM_USA_PATH, "American retail 64DD IPL ROM path:");
DEF_STR(OPTION_IPL_ROM_TOOL_PATH, "Development 64DD IPL ROM path:");
DEF_STR(OPTION_DISKSAVETYPE, "Disk save type:");
DEF_STR(OPTION_ENABLE_ENHANCEMENTS, "Enable enhancements");
DEF_STR(OPTION_SHOW_STATUS_BAR, "Show status bar");
DEF_STR(OPTION_EXIT_FULLSCREEN_ON_LOSE_FOCUS, "Exit fullscreen on lose focus");
DEF_STR(OPTION_DISCORD_RPC, "Enable Discord Rich Presence");
// ROM browser tab
DEF_STR(RB_MAX_ROMS, "Max # of ROMs remembered (0-10):");
@ -266,6 +247,7 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(ADVANCE_SMM_VALIDATE, "Start changed");
DEF_STR(ADVANCE_SMM_PROTECT, "Protect memory");
DEF_STR(ADVANCE_SMM_TLB, "TLB unmapping");
DEF_STR(ADVANCE_ALWAYS_INTERPRETER, "Always use interpreter core");
// ROM options
DEF_STR(ROM_CPU_STYLE, "CPU core style:");
@ -283,7 +265,7 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(ROM_AUDIO_SIGNAL, "RSP audio signal");
DEF_STR(ROM_FIXED_AUDIO, "Fixed audio timing");
DEF_STR(ROM_FUNC_FIND, "Function lookup method:");
DEF_STR(ROM_CUSTOM_SMM, "Custom self mod Method");
DEF_STR(ROM_CUSTOM_SMM, "Custom self-mod Method");
DEF_STR(ROM_SYNC_AUDIO, "Sync using audio");
DEF_STR(ROM_COUNTPERBYTE, "AI count per byte:");
DEF_STR(ROM_32BIT, "32-bit engine:");
@ -291,8 +273,7 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(ROM_OVER_CLOCK_MODIFIER, "Overclock modifier:");
DEF_STR(ROM_UNALIGNED_DMA, "Unaligned DMA");
DEF_STR(ROM_RANDOMIZE_SIPI_INTERRUPTS, "Randomize SI/PI interrupts");
DEF_STR(ROM_MEM_SIZE_NOTE, "Note: 8 MB is forced for Unknown ROMs.");
DEF_STR(ROM_DISK_SEEK_TIMING, "Disk Seek Timing:");
DEF_STR(ROM_DISK_SEEK_TIMING, "Disk seek timing:");
DEF_STR(ROM_DISK_SEEK_TIMING_TURBO, "Turbo");
DEF_STR(ROM_DISK_SEEK_TIMING_SLOW, "Slow");
@ -330,9 +311,6 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(SAVE_SRAM, "SRAM");
DEF_STR(SAVE_FLASHRAM, "Flash RAM");
// Shell integration tab
DEF_STR(SHELL_TEXT, "File extension association:");
// ROM notes
DEF_STR(NOTE_STATUS, "ROM status:");
DEF_STR(NOTE_CORE, "Core note:");
@ -353,7 +331,7 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(ACCEL_CPUSTATE_4, "Game playing (full-screen)");
DEF_STR(ACCEL_DETECTKEY, "Detect Key");
// Frame rate option
// Framerate option
DEF_STR(STR_FR_VIS, "Vertical interrupts per second");
DEF_STR(STR_FR_DLS, "Display lists per second");
DEF_STR(STR_FR_PERCENT, "Percentage of full speed");
@ -373,7 +351,7 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(DISKSAVE_SHADOW, "Full Disk Copy");
DEF_STR(DISKSAVE_RAM, "Save Area Only");
// ROM information
/*** ROM information ***/
// ROM info title
DEF_STR(INFO_TITLE, "ROM Information");
@ -391,7 +369,7 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(INFO_CIC_CHIP_TEXT, "CIC chip:");
DEF_STR(INFO_MD5_TEXT, "MD5:");
// Cheats
/*** Cheats ***/
// Cheat list
DEF_STR(CHEAT_TITLE, "Cheats");
@ -424,7 +402,7 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(CHEAT_NOTES, "&Notes:");
DEF_STR(CHEAT_ADDCHEAT_ADD, "Add Cheat");
DEF_STR(CHEAT_ADDCHEAT_NEW, "New Cheat");
DEF_STR(CHEAT_ADDCHEAT_CODEDES, "<address> <value>");
DEF_STR(CHEAT_ADDCHEAT_CODEDES, "<address> <value>:<old>");
DEF_STR(CHEAT_ADDCHEAT_OPT, "Options:");
DEF_STR(CHEAT_ADDCHEAT_OPTDES, "<value> <label>");
@ -464,11 +442,11 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(MSG_SUPPORT_REQUESTCODE_SUCCESS, "Code has been sent to your email");
DEF_STR(MSG_SUPPORT_REQUESTCODE_FAIL, "Failed to send code, please make sure it is the email you used when you supported Project64");
// Enhancements
/*** Enhancements ***/
DEF_STR(ENHANCEMENT_TITLE, "Enhancements");
// Messages
/*** Messages ***/
DEF_STR(MSG_CPU_PAUSED, "*** CPU PAUSED ***");
DEF_STR(MSG_CPU_RESUMED, "CPU resumed");
@ -536,7 +514,7 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(MSG_CHEAT_INVALID_MSG, "Failed to update cheat, it is invalid");
DEF_STR(MSG_CHEAT_INVALID_TITLE, "Invalid Cheat");
// Android
/*** Android ***/
DEF_STR(ANDROID_SETTINGS, "Settings");
DEF_STR(ANDROID_FORUM, "Help/Forum");
@ -559,9 +537,9 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(ANDROID_ABOUT_REVISION, "Revision");
DEF_STR(ANDROID_ABOUT_TEXT, "Project64 for Android\u2122 is a port of the Windows version of Project64.The Android\u2122 version can play most N64 games.");
DEF_STR(ANDROID_ABOUT_PJ64_AUTHORS, "Project64 Authors.");
DEF_STR(ANDROID_DISCORD, "Discord");
DEF_STR(ANDROID_SUPPORT_PJ64, "Support Project64");
DEF_STR(ANDROID_REVIEW_PJ64, "Review Project64");
DEF_STR(ANDROID_DISCORD, "Discord");
DEF_STR(ANDROID_SUPPORT_PJ64, "Support Project64");
DEF_STR(ANDROID_REVIEW_PJ64, "Review Project64");
// In-game menu
DEF_STR(ANDROID_MENU_SETTINGS, "Settings");

View File

@ -27,15 +27,13 @@ bool CSettingTypeRDBRDRamSize::Load (uint32_t /*Index*/, bool & /*Value*/ ) cons
bool CSettingTypeRDBRDRamSize::Load (uint32_t Index, uint32_t & Value ) const
{
uint32_t ulValue;
stdstr Default;
bool existsInRdb = g_Settings->LoadStringVal(Rdb_GoodName,Default);
bool bRes = m_SettingsIniFile->GetNumber(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultValue,ulValue);
if (!bRes)
{
LoadDefault(Index,ulValue);
}
Value = 0x400000;
if (ulValue == 8 || ulValue == 0x800000 || !existsInRdb) // Default to 8MB if ROM is not in the RDB
if (ulValue == 8 || ulValue == 0x800000)
{
Value = 0x800000;
}

View File

@ -482,7 +482,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
if (g_Settings->LoadBool(UserInterface_ShowCPUPer))
{
g_Settings->SaveBool(UserInterface_ShowCPUPer, false);
g_Notify->DisplayMessage(0, "");
g_Notify->DisplayMessage(0, EMPTY_STRING);
}
else
{
@ -507,7 +507,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
break;
case ID_DEBUG_SHOW_DLIST_COUNT:
g_Settings->SaveBool(Debugger_ShowDListAListCount, !g_Settings->LoadBool(Debugger_ShowDListAListCount));
g_Notify->DisplayMessage(0, "");
g_Notify->DisplayMessage(0, EMPTY_STRING);
break;
case ID_DEBUG_LANGUAGE:
g_Settings->SaveBool(Debugger_DebugLanguage, !g_Settings->LoadBool(Debugger_DebugLanguage));
@ -516,7 +516,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
break;
case ID_DEBUG_SHOW_RECOMP_MEM_SIZE:
g_Settings->SaveBool(Debugger_ShowRecompMemSize, !g_Settings->LoadBool(Debugger_ShowRecompMemSize));
g_Notify->DisplayMessage(0, "");
g_Notify->DisplayMessage(0, EMPTY_STRING);
break;
case ID_DEBUG_SHOW_DIV_BY_ZERO:
g_Settings->SaveBool(Debugger_ShowDivByZero, !g_Settings->LoadBool(Debugger_ShowDivByZero));
@ -752,7 +752,7 @@ void CMainMenu::FillOutMenu(HMENU hMenu)
bool RomLoading = g_Settings->LoadBool(GameRunning_LoadingInProgress);
bool RomLoaded = g_Settings->LoadStringVal(Game_GameName).length() > 0;
bool RomList = UISettingsLoadBool(RomBrowser_Enabled) && !CPURunning;
bool Enhancement = !inBasicMode && g_Settings->LoadBool(Setting_Enhancement);
bool Enhancement = g_Settings->LoadBool(Setting_Enhancement);
CMenuShortCutKey::RUNNING_STATE RunningState = CMenuShortCutKey::RUNNING_STATE_NOT_RUNNING;
if (g_Settings->LoadBool(GameRunning_CPU_Running))

View File

@ -1036,7 +1036,7 @@ LRESULT CALLBACK CMainGui::MainGui_Proc(HWND hWnd, DWORD uMsg, DWORD wParam, DWO
break;
}
Rom.SaveRomSettingID(true);
g_Notify->DisplayMessage(0, "");
g_Notify->DisplayMessage(0, EMPTY_STRING);
BYTE * RomHeader = Rom.GetRomAddress();
WriteTrace(TraceGFXPlugin, TraceDebug, "OnRomBrowserMenuItem - Starting");
g_Plugins->Gfx()->OnRomBrowserMenuItem(LOWORD(wParam), hWnd, RomHeader);

View File

@ -40,14 +40,14 @@ void CRomBrowser::GetFieldInfo(ROMBROWSER_FIELDS_LIST & Fields, bool UseDefault
AddField(Fields, "File Name", -1, RB_FileName, 218, RB_FILENAME, UseDefault);
AddField(Fields, "Internal Name", -1, RB_InternalName, 200, RB_INTERNALNAME, UseDefault);
AddField(Fields, "Good Name", -1, RB_GoodName, 218, RB_GOODNAME, UseDefault);
AddField(Fields, "Name", 0, RB_Name, 218, RB_NAME, UseDefault);
AddField(Fields, "Status", 1, RB_Status, 92, RB_STATUS, UseDefault);
AddField(Fields, "Name", 0, RB_Name, 417, RB_NAME, UseDefault);
AddField(Fields, "Status", 1, RB_Status, 206, RB_STATUS, UseDefault);
AddField(Fields, "Rom Size", -1, RB_RomSize, 100, RB_ROMSIZE, UseDefault);
AddField(Fields, "Notes (Core)", -1, RB_CoreNotes, 120, RB_NOTES_CORE, UseDefault);
AddField(Fields, "Notes (default plugins)", -1, RB_PluginNotes, 188, RB_NOTES_PLUGIN, UseDefault);
AddField(Fields, "Notes (User)", -1, RB_UserNotes, 100, RB_NOTES_USER, UseDefault);
AddField(Fields, "Cartridge ID", -1, RB_CartridgeID, 100, RB_CART_ID, UseDefault);
AddField(Fields, "Media", -1, RB_Media, 100, RB_MANUFACTUER, UseDefault);
AddField(Fields, "Media", -1, RB_Media, 100, RB_MEDIA, UseDefault);
AddField(Fields, "Country", -1, RB_Country, 100, RB_COUNTRY, UseDefault);
AddField(Fields, "Developer", -1, RB_Developer, 100, RB_DEVELOPER, UseDefault);
AddField(Fields, "CRC1", -1, RB_Crc1, 100, RB_CRC1, UseDefault);

View File

@ -14,6 +14,7 @@ CAdvancedOptionsPage::CAdvancedOptionsPage(HWND hParent, const RECT & rcDispay)
SetDlgItemText(IDC_ZIP, wGS(ADVANCE_COMPRESS).c_str());
SetDlgItemText(IDC_DEBUGGER, wGS(ADVANCE_DEBUGGER).c_str());
SetDlgItemText(IDC_REMEMBER_CHEAT, wGS(OPTION_REMEMBER_CHEAT).c_str());
SetDlgItemText(IDC_INTERPRETER, wGS(ADVANCE_ALWAYS_INTERPRETER).c_str());
SetDlgItemText(IDC_UNIQUE_SAVE_DIR, wGS(OPTION_UNIQUE_SAVE_DIR).c_str());
SetDlgItemText(IDC_CHECK_RUNNING, wGS(OPTION_CHECK_RUNNING).c_str());
SetDlgItemText(IDC_ENABLE_ENHANCEMENTS, wGS(OPTION_ENABLE_ENHANCEMENTS).c_str());

View File

@ -10,7 +10,6 @@ CDefaultsOptionsPage::CDefaultsOptionsPage(HWND hParent, const RECT & rcDispay)
UpdatePageSettings();
SetDlgItemText(IDC_MEMORY_SIZE_TEXT, wGS(ROM_MEM_SIZE).c_str());
SetDlgItemText(IDC_MEMORY_SIZE_NOTE, wGS(ROM_MEM_SIZE_NOTE).c_str());
SetDlgItemText(IDC_HLE_GFX, wGS(PLUG_HLE_GFX).c_str());
SetDlgItemText(IDC_USE_TLB, wGS(ROM_USE_TLB).c_str());
SetDlgItemText(IDC_VIREFESH_TEXT, wGS(ROM_VIREFRESH).c_str());

View File

@ -14,6 +14,7 @@ m_SettingsConfig(SettingsConfig)
SetDlgItemText(IDC_AUTOSLEEP, wGS(OPTION_AUTO_SLEEP).c_str());
SetDlgItemText(IDC_LOAD_FULLSCREEN, wGS(OPTION_AUTO_FULLSCREEN).c_str());
SetDlgItemText(IDC_SCREEN_SAVER, wGS(OPTION_DISABLE_SS).c_str());
SetDlgItemText(IDC_DISCORD_RPC, wGS(OPTION_DISCORD_RPC).c_str());
SetDlgItemText(IDC_BASIC_MODE, wGS(OPTION_BASIC_MODE).c_str());
SetDlgItemText(IDC_MAXROMS_TXT, wGS(RB_MAX_ROMS).c_str());
SetDlgItemText(IDC_ROMSEL_TEXT2, wGS(RB_ROMS).c_str());

View File

@ -282,23 +282,23 @@ BEGIN
EDITTEXT IDC_NOTES,5,175,188,36,ES_MULTILINE | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER | WS_VSCROLL
END
IDD_Cheats_Add DIALOGEX 0, 0, 191, 215
IDD_Cheats_Add DIALOGEX 0, 0, 205, 215
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Name:",IDC_NAME,4,6,25,10
EDITTEXT IDC_CODE_NAME,38,4,146,12,ES_AUTOHSCROLL
EDITTEXT IDC_CODE_NAME,52,4,146,12,ES_AUTOHSCROLL
LTEXT "Code:",IDC_CODE,4,24,31,10
LTEXT "<address> <value>",IDC_CODE_DES,4,34,74,10
LTEXT "Options:",IDC_LABEL_OPTIONS,86,24,38,10,WS_DISABLED
LTEXT "<value> <label>",IDC_LABEL_OPTIONS_FORMAT,86,34,80,10,WS_DISABLED
EDITTEXT IDC_CHEAT_CODES,4,44,75,96,ES_MULTILINE | ES_UPPERCASE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL
EDITTEXT IDC_CHEAT_OPTIONS,86,44,98,96,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_DISABLED | WS_VSCROLL | WS_HSCROLL
LTEXT "<address> <value>:<old>",IDC_CODE_DES,4,34,92,10
LTEXT "Options:",IDC_LABEL_OPTIONS,101,24,38,10,WS_DISABLED
LTEXT "<value> <label>",IDC_LABEL_OPTIONS_FORMAT,101,34,80,10,WS_DISABLED
EDITTEXT IDC_CHEAT_CODES,4,44,88,96,ES_MULTILINE | ES_UPPERCASE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL
EDITTEXT IDC_CHEAT_OPTIONS,100,44,98,96,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_DISABLED | WS_VSCROLL | WS_HSCROLL
LTEXT "Cheat Notes",IDC_CHEATNOTES,3,149,60,10
EDITTEXT IDC_NOTES,4,160,180,32,ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL
PUSHBUTTON "New Cheat",IDC_NEWCHEAT,16,198,75,15
PUSHBUTTON "Add Cheat",IDC_ADD,98,198,75,15,WS_DISABLED
EDITTEXT IDC_NOTES,4,160,194,32,ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL
PUSHBUTTON "New Cheat",IDC_NEWCHEAT,23,198,75,15
PUSHBUTTON "Add Cheat",IDC_ADD,105,198,75,15,WS_DISABLED
END
IDD_Cheats_CodeEx DIALOGEX 0, 0, 186, 153
@ -372,7 +372,7 @@ IDD_About DIALOGEX 0, 0, 247, 265
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_BMP_LOGO,"Static",SS_BLACKFRAME,15,0,232,74
CONTROL "",IDC_BMP_LOGO,"Static",SS_BLACKFRAME,7,0,232,74
LTEXT "Special Thanks to previous core members:",IDC_THANKS_CORE,10,169,231,8
LTEXT "Jabo, Smiff, Gent",IDC_CORE_THANK_LIST,10,186,231,8
LTEXT "Version: 1.7.0.x",IDC_VERSION,10,79,231,11,SS_NOTIFY
@ -472,23 +472,22 @@ BEGIN
PUSHBUTTON "Close",IDCANCEL,154,110,50,14
END
IDD_Welcome DIALOGEX 0, 0, 234, 167
IDD_Welcome DIALOGEX 0, 0, 235, 171
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION
CAPTION "Project64 - Welcome"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "OK",IDOK,90,149,50,12
LTEXT "Select Language:",IDC_SELECT_LANG,12,77,86,12
COMBOBOX IDC_LANG_SEL,82,77,130,120,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_BMP_LOGO,"Static",SS_BLACKFRAME,1,0,232,74
LTEXT "Game Directory:",IDC_GAME_DIR_STATIC,12,92,86,12
EDITTEXT IDC_GAME_DIR,82,91,130,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_SELECT_GAME_DIR,215,91,14,12
CONTROL "GlideN64\n________\nModern Design\nFor newer computers",IDC_RADIO_GLIDEN64,
"Button",BS_AUTORADIOBUTTON | BS_MULTILINE,76,107,80,35
CONTROL "Project64-Video\n_____________\nWorks on basically any computer",IDC_RADIO_PJ64_VIDEO,
"Button",BS_AUTORADIOBUTTON | BS_MULTILINE,157,107,73,35
LTEXT "Video Plugin:",IDC_VIDEO_PLUGIN_STATIC,12,108,61,14
DEFPUSHBUTTON "OK",IDOK,90,150,55,15
RTEXT "Language:",IDC_SELECT_LANG,6,82,60,12
COMBOBOX IDC_LANG_SEL,76,80,130,120,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_BMP_LOGO,"Static",SS_BLACKFRAME,2,0,232,74
RTEXT "Game Directory:",IDC_GAME_DIR_STATIC,6,99,60,12
EDITTEXT IDC_GAME_DIR,76,97,130,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_SELECT_GAME_DIR,209,97,17,12
CONTROL " GLideN64 \nFor modern PC",IDC_RADIO_GLIDEN64,"Button",BS_AUTORADIOBUTTON | BS_CENTER | BS_PUSHLIKE | BS_MULTILINE,75,115,70,24
CONTROL " Project64 Video \nFor older PC",IDC_RADIO_PJ64_VIDEO,
"Button",BS_AUTORADIOBUTTON | BS_CENTER | BS_PUSHLIKE | BS_MULTILINE,153,115,73,24
RTEXT "Video Plugin:",IDC_VIDEO_PLUGIN_STATIC,6,117,60,14
END
IDD_Debugger_Memory DIALOGEX 0, 0, 321, 199
@ -1234,24 +1233,23 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Memory Size:",IDC_MEMORY_SIZE_TEXT,6,8,91,10
COMBOBOX IDC_RDRAM_SIZE,102,6,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,106,91,10
CONTROL "Use TLB",IDC_USE_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,82,91,10
LTEXT "Vi Refresh Rate:",IDC_VIREFESH_TEXT,6,51,91,10
EDITTEXT IDC_VIREFRESH,102,49,109,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "AI Count Per Byte:",IDC_COUNTPERBYTE_TEXT,6,65,91,10
EDITTEXT IDC_COUNTPERBYTE,102,64,109,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Counter Factor:",IDC_COUNTFACT_TEXT,6,35,91,10
COMBOBOX IDC_COUNTFACT,102,34,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "32 Bit Engine",IDC_ROM_32BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,82,91,10
CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,94,91,10
CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,94,91,10
CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,93,91,10
CONTROL "Use TLB",IDC_USE_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,69,91,10
LTEXT "Vi Refresh Rate:",IDC_VIREFESH_TEXT,6,38,91,10
EDITTEXT IDC_VIREFRESH,102,36,109,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "AI Count Per Byte:",IDC_COUNTPERBYTE_TEXT,6,52,91,10
EDITTEXT IDC_COUNTPERBYTE,102,51,109,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Counter Factor:",IDC_COUNTFACT_TEXT,6,22,91,10
COMBOBOX IDC_COUNTFACT,102,21,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "32 Bit Engine",IDC_ROM_32BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,69,91,10
CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,81,91,10
CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,81,91,10
CONTROL "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,106,107,10
CONTROL "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,118,91,10
CONTROL "Protect Memory",IDC_PROTECT_MEMORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,118,91,10
RTEXT "Note: 8 MB is forced for Unknown ROMs.",IDC_MEMORY_SIZE_NOTE,6,22,205,8
COMBOBOX IDC_DISKSEEKTIMING,102,132,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Disk Seek Timing:",IDC_DISKSEEKTIMING_TEXT1,6,134,91,10
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,93,107,10
CONTROL "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,105,91,10
CONTROL "Protect Memory",IDC_PROTECT_MEMORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,105,91,10
COMBOBOX IDC_DISKSEEKTIMING,102,121,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Disk Seek Timing:",IDC_DISKSEEKTIMING_TEXT1,6,123,91,10
END
IDD_Enhancement_Config DIALOGEX 0, 0, 206, 214
@ -1259,8 +1257,8 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTI
CAPTION "Enhancements"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX " Notes: ",IDC_NOTESFRAME,0,156,199,51
EDITTEXT IDC_NOTES,5,171,188,36,ES_MULTILINE | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER | WS_VSCROLL
GROUPBOX " Notes: ",IDC_NOTESFRAME,5,159,194,51
EDITTEXT IDC_NOTES,8,171,186,36,ES_MULTILINE | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER | WS_VSCROLL
CONTROL "",IDC_ENHANCEMENTLIST,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,5,7,194,146
END
@ -1513,7 +1511,7 @@ BEGIN
IDD_Cheats_Add, DIALOG
BEGIN
LEFTMARGIN, 4
RIGHTMARGIN, 184
RIGHTMARGIN, 198
TOPMARGIN, 4
END
@ -1595,8 +1593,8 @@ BEGIN
IDD_Welcome, DIALOG
BEGIN
RIGHTMARGIN, 233
BOTTOMMARGIN, 161
RIGHTMARGIN, 234
BOTTOMMARGIN, 165
END
IDD_Debugger_Memory, DIALOG

View File

@ -701,7 +701,6 @@
#define IDC_STATUSBAR 1572
#define IDC_CMB_JUMP 1573
#define IDC_COPYTABREGISTERS_BTN 1574
#define IDC_MEMORY_SIZE_NOTE 1574
#define IDC_F0_LBL 1575
#define IDC_GAME_DIR 1575
#define IDC_F1_LBL 1576