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

Merge pull request #2023 from vgturtle127/beautification-8 

Beautification 8 - Source\Project64\UserInterface\Settings directory
This commit is contained in:
zilmar 2021-03-23 12:46:38 +10:30 committed by GitHub
parent 04e2263354 5d2d412c45
commit b4c64ef734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64/UserInterface/Settings/SettingsPage-AdvancedOptions.cpp
View File

@ -9,7 +9,7 @@ CAdvancedOptionsPage::CAdvancedOptionsPage(HWND hParent, const RECT & rcDispay)
return; return;
} }
//Set the text for all gui Items // Set the text for all GUI items
SetDlgItemText(IDC_START_ON_ROM_OPEN, wGS(ADVANCE_AUTO_START).c_str()); SetDlgItemText(IDC_START_ON_ROM_OPEN, wGS(ADVANCE_AUTO_START).c_str());
SetDlgItemText(IDC_ZIP, wGS(ADVANCE_COMPRESS).c_str()); SetDlgItemText(IDC_ZIP, wGS(ADVANCE_COMPRESS).c_str());
SetDlgItemText(IDC_DEBUGGER, wGS(ADVANCE_DEBUGGER).c_str()); SetDlgItemText(IDC_DEBUGGER, wGS(ADVANCE_DEBUGGER).c_str());

6
Source/Project64/UserInterface/Settings/SettingsPage-Directories.cpp
View File

@ -35,7 +35,7 @@ m_InUpdateSettings(false)
m_TextureDefault.Attach(GetDlgItem(IDC_TEXTURE_DEFAULT)); m_TextureDefault.Attach(GetDlgItem(IDC_TEXTURE_DEFAULT));
m_TextureSelected.Attach(GetDlgItem(IDC_TEXTURE_OTHER)); m_TextureSelected.Attach(GetDlgItem(IDC_TEXTURE_OTHER));
//Set Text language for the dialog box // Set text language for the dialog box
::SetWindowText(m_PluginGroup.m_hWnd, wGS(DIR_PLUGIN).c_str()); ::SetWindowText(m_PluginGroup.m_hWnd, wGS(DIR_PLUGIN).c_str());
::SetWindowText(m_AutoSaveGroup.m_hWnd, wGS(DIR_AUTO_SAVE).c_str()); ::SetWindowText(m_AutoSaveGroup.m_hWnd, wGS(DIR_AUTO_SAVE).c_str());
::SetWindowText(m_InstantSaveGroup.m_hWnd, wGS(DIR_INSTANT_SAVE).c_str()); ::SetWindowText(m_InstantSaveGroup.m_hWnd, wGS(DIR_INSTANT_SAVE).c_str());
@ -50,8 +50,8 @@ int CALLBACK COptionsDirectoriesPage::SelectDirCallBack(HWND hwnd, DWORD uMsg, D
switch (uMsg) switch (uMsg)
{ {
case BFFM_INITIALIZED: case BFFM_INITIALIZED:
// WParam is TRUE since you are passing a path. // WParam is TRUE since you are passing a path
// It would be FALSE if you were passing a pidl. // It would be FALSE if you were passing a PIDL
if (lpData) if (lpData)
{ {
SendMessage(hwnd, BFFM_SETSELECTION, TRUE, lpData); SendMessage(hwnd, BFFM_SETSELECTION, TRUE, lpData);

4
Source/Project64/UserInterface/Settings/SettingsPage-DiskDrive.cpp
View File

@ -9,7 +9,7 @@ CDiskDrivePage::CDiskDrivePage(HWND hParent, const RECT & rcDispay)
return; return;
} }
//Set the text for all gui Items // Set the text for all GUI items
SetDlgItemText(IDC_IPLDIR_JP_TXT, wGS(OPTION_IPL_ROM_PATH).c_str()); SetDlgItemText(IDC_IPLDIR_JP_TXT, wGS(OPTION_IPL_ROM_PATH).c_str());
SetDlgItemText(IDC_IPLDIR_US_TXT, wGS(OPTION_IPL_ROM_USA_PATH).c_str()); SetDlgItemText(IDC_IPLDIR_US_TXT, wGS(OPTION_IPL_ROM_USA_PATH).c_str());
SetDlgItemText(IDC_IPLDIR_TL_TXT, wGS(OPTION_IPL_ROM_TOOL_PATH).c_str()); SetDlgItemText(IDC_IPLDIR_TL_TXT, wGS(OPTION_IPL_ROM_TOOL_PATH).c_str());
@ -140,7 +140,7 @@ void CDiskDrivePage::UpdatePageSettings(void)
void CDiskDrivePage::SelectFile(LanguageStringID /*Title*/, CModifiedEditBox & EditBox) void CDiskDrivePage::SelectFile(LanguageStringID /*Title*/, CModifiedEditBox & EditBox)
{ {
const char * Filter = "64DD IPL ROM Image (*.zip, *.7z, *.?64, *.rom, *.usa, *.jap, *.pal, *.bin)\0*.?64;*.zip;*.7z;*.bin;*.rom;*.usa;*.jap;*.pal\0All files (*.*)\0*.*\0"; const char * Filter = "64DD IPL ROM image (*.zip, *.7z, *.?64, *.rom, *.usa, *.jap, *.pal, *.bin)\0*.?64;*.zip;*.7z;*.bin;*.rom;*.usa;*.jap;*.pal\0All files (*.*)\0*.*\0";
CPath FileName; CPath FileName;
if (FileName.SelectFile(m_hWnd, g_Settings->LoadStringVal(RomList_GameDir).c_str(), Filter, true)) if (FileName.SelectFile(m_hWnd, g_Settings->LoadStringVal(RomList_GameDir).c_str(), Filter, true))

2
Source/Project64/UserInterface/Settings/SettingsPage-Game-DiskDrive.cpp
View File

@ -10,7 +10,7 @@ CGameDiskDrivePage::CGameDiskDrivePage(HWND hParent, const RECT & rcDispay)
return; return;
} }
//Set the text for all gui Items // Set the text for all GUI items
SetDlgItemText(IDC_DISKSEEKTIMING_TEXT2, wGS(ROM_DISK_SEEK_TIMING).c_str()); SetDlgItemText(IDC_DISKSEEKTIMING_TEXT2, wGS(ROM_DISK_SEEK_TIMING).c_str());
CModifiedComboBox* ComboBox; CModifiedComboBox* ComboBox;

2
Source/Project64/UserInterface/Settings/SettingsPage-Game-General.cpp
View File

@ -10,7 +10,7 @@ CGameGeneralPage::CGameGeneralPage(HWND hParent, const RECT & rcDispay)
return; return;
} }
//Set the text for all gui Items // Set the text for all GUI items
SetDlgItemText(IDC_GOOD_NAME_TEXT, wGS(RB_GOODNAME).c_str()); SetDlgItemText(IDC_GOOD_NAME_TEXT, wGS(RB_GOODNAME).c_str());
SetDlgItemText(IDC_MEMORY_SIZE_TEXT, wGS(ROM_MEM_SIZE).c_str()); SetDlgItemText(IDC_MEMORY_SIZE_TEXT, wGS(ROM_MEM_SIZE).c_str());

4
Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.cpp
View File

@ -10,7 +10,7 @@ CGamePluginPage::CGamePluginPage(HWND hParent, const RECT & rcDispay)
return; return;
} }
//Set the text for all gui Items // Set the text for all GUI items
SetDlgItemText(RSP_ABOUT, wGS(PLUG_ABOUT).c_str()); SetDlgItemText(RSP_ABOUT, wGS(PLUG_ABOUT).c_str());
SetDlgItemText(GFX_ABOUT, wGS(PLUG_ABOUT).c_str()); SetDlgItemText(GFX_ABOUT, wGS(PLUG_ABOUT).c_str());
SetDlgItemText(AUDIO_ABOUT, wGS(PLUG_ABOUT).c_str()); SetDlgItemText(AUDIO_ABOUT, wGS(PLUG_ABOUT).c_str());
@ -119,7 +119,7 @@ void CGamePluginPage::ShowAboutButton(int id)
void(CALL *DllAbout) (HWND hWnd); void(CALL *DllAbout) (HWND hWnd);
DllAbout = (void(CALL *)(HWND))GetProcAddress(hLib, "DllAbout"); DllAbout = (void(CALL *)(HWND))GetProcAddress(hLib, "DllAbout");
//call the function from the dll // Call the function from the DLL
DllAbout(m_hWnd); DllAbout(m_hWnd);
FreeLibrary(hLib); FreeLibrary(hLib);

2
Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.cpp
View File

@ -10,7 +10,7 @@ CGameRecompilePage::CGameRecompilePage(HWND hParent, const RECT & rcDispay)
return; return;
} }
//Set the text for all gui Items // Set the text for all GUI items
SetDlgItemText(IDC_CPU_TYPE_TEXT, wGS(ROM_CPU_STYLE).c_str()); SetDlgItemText(IDC_CPU_TYPE_TEXT, wGS(ROM_CPU_STYLE).c_str());
SetDlgItemText(IDC_FUNCFIND_TEXT, wGS(ROM_FUNC_FIND).c_str()); SetDlgItemText(IDC_FUNCFIND_TEXT, wGS(ROM_FUNC_FIND).c_str());

2
Source/Project64/UserInterface/Settings/SettingsPage-Game-Status.cpp
View File

@ -12,7 +12,7 @@ CGameStatusPage::CGameStatusPage(HWND hParent, const RECT & rcDispay)
CIniFile RomIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str()); CIniFile RomIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str());
CIniFile::strlist Keys; CIniFile::strlist Keys;
RomIniFile.GetKeyList("Rom Status", Keys); RomIniFile.GetKeyList("ROM Status", Keys);
stdstr Status = UISettingsLoadStringVal(Rdb_Status); stdstr Status = UISettingsLoadStringVal(Rdb_Status);
CModifiedComboBoxTxt * ComboBox; CModifiedComboBoxTxt * ComboBox;

8
Source/Project64/UserInterface/Settings/SettingsPage-GameBrowser.cpp
View File

@ -93,11 +93,11 @@ void COptionsGameBrowserPage::AddFieldClicked(UINT /*Code*/, int /*id*/, HWND /*
{ {
return; return;
} }
//remove from list // Remove from list
int i = m_Avaliable.GetItemData(index); int i = m_Avaliable.GetItemData(index);
m_Avaliable.DeleteString(index); m_Avaliable.DeleteString(index);
//select next in list // Select next in list
int listCount = m_Avaliable.GetCount(); int listCount = m_Avaliable.GetCount();
if (index >= listCount) { index -= 1; } if (index >= listCount) { index -= 1; }
m_Avaliable.SetCurSel(index); m_Avaliable.SetCurSel(index);
@ -119,11 +119,11 @@ void COptionsGameBrowserPage::RemoveFieldClicked(UINT /*Code*/, int /*id*/, HWND
{ {
return; return;
} }
//remove from list // Remove from list
int i = m_Using.GetItemData(index); int i = m_Using.GetItemData(index);
m_Using.DeleteString(index); m_Using.DeleteString(index);
//select next in list // Select next in list
int listCount = m_Using.GetCount(); int listCount = m_Using.GetCount();
if (index >= listCount) { index -= 1; } if (index >= listCount) { index -= 1; }
m_Using.SetCurSel(index); m_Using.SetCurSel(index);

2
Source/Project64/UserInterface/Settings/SettingsPage-KeyboardShortcuts.cpp
View File

@ -76,7 +76,7 @@ void COptionsShortCutsPage::OnCpuStateChanged(UINT /*Code*/, int /*id*/, HWND /*
continue; continue;
} }
//find Parent // Find parent
HTREEITEM hParent = m_MenuItems.GetChildItem(TVI_ROOT); HTREEITEM hParent = m_MenuItems.GetChildItem(TVI_ROOT);
while (hParent) while (hParent)
{ {

2
Source/Project64/UserInterface/Settings/SettingsPage-Options.cpp
View File

@ -10,7 +10,7 @@ m_SettingsConfig(SettingsConfig)
return; return;
} }
//Set the text for all gui Items // Set the text for all GUI items
SetDlgItemText(IDC_AUTOSLEEP, wGS(OPTION_AUTO_SLEEP).c_str()); SetDlgItemText(IDC_AUTOSLEEP, wGS(OPTION_AUTO_SLEEP).c_str());
SetDlgItemText(IDC_LOAD_FULLSCREEN, wGS(OPTION_AUTO_FULLSCREEN).c_str()); SetDlgItemText(IDC_LOAD_FULLSCREEN, wGS(OPTION_AUTO_FULLSCREEN).c_str());
SetDlgItemText(IDC_SCREEN_SAVER, wGS(OPTION_DISABLE_SS).c_str()); SetDlgItemText(IDC_SCREEN_SAVER, wGS(OPTION_DISABLE_SS).c_str());

4
Source/Project64/UserInterface/Settings/SettingsPage-Plugin.cpp
View File

@ -9,7 +9,7 @@ COptionPluginPage::COptionPluginPage(HWND hParent, const RECT & rcDispay)
return; return;
} }
//Set the text for all gui Items // Set the text for all GUI items
SetDlgItemText(RSP_ABOUT, wGS(PLUG_ABOUT).c_str()); SetDlgItemText(RSP_ABOUT, wGS(PLUG_ABOUT).c_str());
SetDlgItemText(GFX_ABOUT, wGS(PLUG_ABOUT).c_str()); SetDlgItemText(GFX_ABOUT, wGS(PLUG_ABOUT).c_str());
SetDlgItemText(AUDIO_ABOUT, wGS(PLUG_ABOUT).c_str()); SetDlgItemText(AUDIO_ABOUT, wGS(PLUG_ABOUT).c_str());
@ -111,7 +111,7 @@ void COptionPluginPage::ShowAboutButton(int id)
void(CALL *DllAbout) (HWND hWnd); void(CALL *DllAbout) (HWND hWnd);
DllAbout = (void(CALL *)(HWND))GetProcAddress(hLib, "DllAbout"); DllAbout = (void(CALL *)(HWND))GetProcAddress(hLib, "DllAbout");
//call the function from the dll // Call the function from the DLL
DllAbout(m_hWnd); DllAbout(m_hWnd);
FreeLibrary(hLib); FreeLibrary(hLib);