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

Minor layout fixes 

- Fixed Notes in Enhancements window
- Fix Add Cheat to accommodate for cheat disable value feature
- Center about window header
This commit is contained in:
oddMLan 2021-05-25 16:00:54 -07:00 committed by zilmar
parent 7368802c00
commit aa05e02337
6 changed files with 59 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-core/Multilanguage.h
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,

91
Source/Project64-core/Multilanguage/Language.cpp
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,13 @@ 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 +46,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");
@ -124,7 +106,7 @@ void CLanguage::LoadDefaultStrings(void)
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_ENHANCEMENTS, "Pick Enhancements");
// Alternate name to save slot
DEF_STR(SAVE_SLOT_DEFAULT, "Save Slot - Default");
@ -141,18 +123,20 @@ void CLanguage::LoadDefaultStrings(void)
// 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 +147,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 +155,21 @@ 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");
@ -330,9 +315,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 +335,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 +355,8 @@ 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 +374,8 @@ 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");
@ -464,11 +448,13 @@ 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 +522,8 @@ 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");

6
Source/Project64/UserInterface/MainMenu.cpp
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));

2
Source/Project64/UserInterface/MainWindow.cpp
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);

2
Source/Project64/UserInterface/RomBrowser.cpp
View File

@ -47,7 +47,7 @@ void CRomBrowser::GetFieldInfo(ROMBROWSER_FIELDS_LIST & Fields, bool 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);

28
Source/Project64/UserInterface/UIResources.rc
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,8,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
@ -1259,8 +1259,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 +1513,7 @@ BEGIN
IDD_Cheats_Add, DIALOG
BEGIN
LEFTMARGIN, 4
RIGHTMARGIN, 184
RIGHTMARGIN, 198
TOPMARGIN, 4
END