From 94bb55cef0d183cadac2decf80cf57caf9975cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 4 Jun 2017 10:20:16 +0200 Subject: [PATCH 1/2] WX: Replace 'BIOS' with 'IPL' It's not really a BIOS. --- .../DolphinWX/Config/GameCubeConfigPane.cpp | 18 +++++++++--------- .../Core/DolphinWX/Config/GameCubeConfigPane.h | 4 ++-- Source/Core/DolphinWX/Frame.h | 6 +++--- Source/Core/DolphinWX/FrameTools.cpp | 18 +++++++++--------- Source/Core/DolphinWX/Globals.h | 6 +++--- Source/Core/DolphinWX/MainMenuBar.cpp | 16 ++++++++-------- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp index b4350562d4..e901dc6eb6 100644 --- a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp @@ -66,7 +66,7 @@ void GameCubeConfigPane::InitializeGUI() "Lets the system language be set to values that games were not designed for. This can allow " "the use of extra translations for a few games, but can also lead to text display issues.")); - m_skip_bios_checkbox = new wxCheckBox(this, wxID_ANY, _("Skip BIOS")); + m_skip_ipl_checkbox = new wxCheckBox(this, wxID_ANY, _("Skip IPL")); if (!File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) && !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) && @@ -75,8 +75,8 @@ void GameCubeConfigPane::InitializeGUI() !File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL) && !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL)) { - m_skip_bios_checkbox->Disable(); - m_skip_bios_checkbox->SetToolTip(_("Put BIOS roms in User/GC/{region}.")); + m_skip_ipl_checkbox->Disable(); + m_skip_ipl_checkbox->SetToolTip(_("Put IPL roms in User/GC/{region}.")); } // Device settings @@ -102,7 +102,7 @@ void GameCubeConfigPane::InitializeGUI() // Populate the GameCube page wxGridBagSizer* const sGamecubeIPLSettings = new wxGridBagSizer(space5, space5); - sGamecubeIPLSettings->Add(m_skip_bios_checkbox, wxGBPosition(0, 0), wxGBSpan(1, 2)); + sGamecubeIPLSettings->Add(m_skip_ipl_checkbox, wxGBPosition(0, 0), wxGBSpan(1, 2)); sGamecubeIPLSettings->Add(new wxStaticText(this, wxID_ANY, _("System Language:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); sGamecubeIPLSettings->Add(m_system_lang_choice, wxGBPosition(1, 1), wxDefaultSpan, @@ -148,7 +148,7 @@ void GameCubeConfigPane::LoadGUIValues() const SConfig& startup_params = SConfig::GetInstance(); m_system_lang_choice->SetSelection(startup_params.SelectedLanguage); - m_skip_bios_checkbox->SetValue(startup_params.bHLE_BS2); + m_skip_ipl_checkbox->SetValue(startup_params.bHLE_BS2); m_override_lang_checkbox->SetValue(startup_params.bOverrideGCLanguage); wxArrayString slot_devices; @@ -219,8 +219,8 @@ void GameCubeConfigPane::BindEvents() &GameCubeConfigPane::OnOverrideLanguageCheckBoxChanged, this); m_override_lang_checkbox->Bind(wxEVT_UPDATE_UI, &WxEventUtils::OnEnableIfCoreNotRunning); - m_skip_bios_checkbox->Bind(wxEVT_CHECKBOX, &GameCubeConfigPane::OnSkipBiosCheckBoxChanged, this); - m_skip_bios_checkbox->Bind(wxEVT_UPDATE_UI, &WxEventUtils::OnEnableIfCoreNotRunning); + m_skip_ipl_checkbox->Bind(wxEVT_CHECKBOX, &GameCubeConfigPane::OnSkipIPLCheckBoxChanged, this); + m_skip_ipl_checkbox->Bind(wxEVT_UPDATE_UI, &WxEventUtils::OnEnableIfCoreNotRunning); m_exi_devices[0]->Bind(wxEVT_CHOICE, &GameCubeConfigPane::OnSlotAChanged, this); m_exi_devices[0]->Bind(wxEVT_UPDATE_UI, &WxEventUtils::OnEnableIfNetplayNotRunning); @@ -247,9 +247,9 @@ void GameCubeConfigPane::OnOverrideLanguageCheckBoxChanged(wxCommandEvent& event AddPendingEvent(wxCommandEvent(wxDOLPHIN_CFG_REFRESH_LIST)); } -void GameCubeConfigPane::OnSkipBiosCheckBoxChanged(wxCommandEvent& event) +void GameCubeConfigPane::OnSkipIPLCheckBoxChanged(wxCommandEvent& event) { - SConfig::GetInstance().bHLE_BS2 = m_skip_bios_checkbox->IsChecked(); + SConfig::GetInstance().bHLE_BS2 = m_skip_ipl_checkbox->IsChecked(); } void GameCubeConfigPane::OnSlotAChanged(wxCommandEvent& event) diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.h b/Source/Core/DolphinWX/Config/GameCubeConfigPane.h index 0cdb460fe2..56e81370fb 100644 --- a/Source/Core/DolphinWX/Config/GameCubeConfigPane.h +++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.h @@ -29,7 +29,7 @@ private: void OnSystemLanguageChange(wxCommandEvent&); void OnOverrideLanguageCheckBoxChanged(wxCommandEvent&); - void OnSkipBiosCheckBoxChanged(wxCommandEvent&); + void OnSkipIPLCheckBoxChanged(wxCommandEvent&); void OnSlotAChanged(wxCommandEvent&); void OnSlotBChanged(wxCommandEvent&); void OnSP1Changed(wxCommandEvent&); @@ -44,7 +44,7 @@ private: wxChoice* m_system_lang_choice; wxCheckBox* m_override_lang_checkbox; - wxCheckBox* m_skip_bios_checkbox; + wxCheckBox* m_skip_ipl_checkbox; wxChoice* m_exi_devices[3]; wxButton* m_memcard_path[2]; }; diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index aadba9d5df..a0635321f8 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -328,9 +328,9 @@ private: void OnImportSave(wxCommandEvent& event); void OnExportAllSaves(wxCommandEvent& event); - void OnLoadGameCubeBIOSJAP(wxCommandEvent& event); - void OnLoadGameCubeBIOSUSA(wxCommandEvent& event); - void OnLoadGameCubeBIOSEUR(wxCommandEvent& event); + void OnLoadGameCubeIPLJAP(wxCommandEvent& event); + void OnLoadGameCubeIPLUSA(wxCommandEvent& event); + void OnLoadGameCubeIPLEUR(wxCommandEvent& event); void OnNetPlay(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index b59720ad71..6dc24aec15 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -169,9 +169,9 @@ void CFrame::BindMenuBarEvents() Bind(wxEVT_MENU, &CFrame::OnMemcard, this, IDM_MEMCARD); Bind(wxEVT_MENU, &CFrame::OnImportSave, this, IDM_IMPORT_SAVE); Bind(wxEVT_MENU, &CFrame::OnExportAllSaves, this, IDM_EXPORT_ALL_SAVE); - Bind(wxEVT_MENU, &CFrame::OnLoadGameCubeBIOSJAP, this, IDM_LOAD_GC_BIOS_JAP); - Bind(wxEVT_MENU, &CFrame::OnLoadGameCubeBIOSUSA, this, IDM_LOAD_GC_BIOS_USA); - Bind(wxEVT_MENU, &CFrame::OnLoadGameCubeBIOSEUR, this, IDM_LOAD_GC_BIOS_EUR); + Bind(wxEVT_MENU, &CFrame::OnLoadGameCubeIPLJAP, this, IDM_LOAD_GC_IPL_JAP); + Bind(wxEVT_MENU, &CFrame::OnLoadGameCubeIPLUSA, this, IDM_LOAD_GC_IPL_USA); + Bind(wxEVT_MENU, &CFrame::OnLoadGameCubeIPLEUR, this, IDM_LOAD_GC_IPL_EUR); Bind(wxEVT_MENU, &CFrame::OnShowCheatsWindow, this, IDM_CHEATS); Bind(wxEVT_MENU, &CFrame::OnNetPlay, this, IDM_NETPLAY); Bind(wxEVT_MENU, &CFrame::OnInstallWAD, this, IDM_MENU_INSTALL_WAD); @@ -1167,17 +1167,17 @@ void CFrame::OnMemcard(wxCommandEvent& WXUNUSED(event)) HotkeyManagerEmu::Enable(true); } -void CFrame::OnLoadGameCubeBIOSJAP(wxCommandEvent&) +void CFrame::OnLoadGameCubeIPLJAP(wxCommandEvent&) { StartGame("", SConfig::BOOT_BS2_JAP); } -void CFrame::OnLoadGameCubeBIOSUSA(wxCommandEvent&) +void CFrame::OnLoadGameCubeIPLUSA(wxCommandEvent&) { StartGame("", SConfig::BOOT_BS2_USA); } -void CFrame::OnLoadGameCubeBIOSEUR(wxCommandEvent&) +void CFrame::OnLoadGameCubeIPLEUR(wxCommandEvent&) { StartGame("", SConfig::BOOT_BS2_EUR); } @@ -1489,13 +1489,13 @@ void CFrame::UpdateGUI() // Misc GetMenuBar()->FindItem(IDM_CHANGE_DISC)->Enable(Initialized); GetMenuBar() - ->FindItem(IDM_LOAD_GC_BIOS_JAP) + ->FindItem(IDM_LOAD_GC_IPL_JAP) ->Enable(!Initialized && File::Exists(SConfig::GetInstance().GetBootROMPath(JAP_DIR))); GetMenuBar() - ->FindItem(IDM_LOAD_GC_BIOS_USA) + ->FindItem(IDM_LOAD_GC_IPL_USA) ->Enable(!Initialized && File::Exists(SConfig::GetInstance().GetBootROMPath(USA_DIR))); GetMenuBar() - ->FindItem(IDM_LOAD_GC_BIOS_EUR) + ->FindItem(IDM_LOAD_GC_IPL_EUR) ->Enable(!Initialized && File::Exists(SConfig::GetInstance().GetBootROMPath(EUR_DIR))); if (DiscIO::CNANDContentManager::Access() .GetNANDLoader(TITLEID_SYSMENU, Common::FROM_CONFIGURED_ROOT) diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 4abebdbcfa..ac066872ee 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -105,9 +105,9 @@ enum IDM_IMPORT_NAND, IDM_EXTRACT_CERTIFICATES, IDM_FIFOPLAYER, - IDM_LOAD_GC_BIOS_JAP, - IDM_LOAD_GC_BIOS_USA, - IDM_LOAD_GC_BIOS_EUR, + IDM_LOAD_GC_IPL_JAP, + IDM_LOAD_GC_IPL_USA, + IDM_LOAD_GC_IPL_EUR, IDM_CONNECT_WIIMOTE1, IDM_CONNECT_WIIMOTE2, IDM_CONNECT_WIIMOTE3, diff --git a/Source/Core/DolphinWX/MainMenuBar.cpp b/Source/Core/DolphinWX/MainMenuBar.cpp index eb977ccf0e..d21686e40f 100644 --- a/Source/Core/DolphinWX/MainMenuBar.cpp +++ b/Source/Core/DolphinWX/MainMenuBar.cpp @@ -217,14 +217,14 @@ wxMenu* MainMenuBar::CreateToolsMenu() const tools_menu->Append(IDM_EXPORT_ALL_SAVE, _("Export All Wii Saves")); tools_menu->AppendSeparator(); auto* const gc_bios_menu = new wxMenu; - gc_bios_menu->Append(IDM_LOAD_GC_BIOS_JAP, _("NTSC-J"), - _("Load NTSC-J GameCube BIOS from the JAP folder.")); - gc_bios_menu->Append(IDM_LOAD_GC_BIOS_USA, _("NTSC-U"), - _("Load NTSC-U GameCube BIOS from the USA folder.")); - gc_bios_menu->Append(IDM_LOAD_GC_BIOS_EUR, _("PAL"), - _("Load PAL GameCube BIOS from the EUR folder.")); - tools_menu->AppendSubMenu(gc_bios_menu, _("Load GameCube BIOS"), - _("Load a GameCube BIOS located under Dolphin's GC folder.")); + gc_bios_menu->Append(IDM_LOAD_GC_IPL_JAP, _("NTSC-J"), + _("Load NTSC-J GameCube IPL from the JAP folder.")); + gc_bios_menu->Append(IDM_LOAD_GC_IPL_USA, _("NTSC-U"), + _("Load NTSC-U GameCube IPL from the USA folder.")); + gc_bios_menu->Append(IDM_LOAD_GC_IPL_EUR, _("PAL"), + _("Load PAL GameCube IPL from the EUR folder.")); + tools_menu->AppendSubMenu(gc_bios_menu, _("Load GameCube IPL"), + _("Load a GameCube IPL located under Dolphin's GC folder.")); tools_menu->AppendSeparator(); tools_menu->Append(IDM_CHEATS, _("&Cheat Manager")); tools_menu->Append(IDM_NETPLAY, _("Start &NetPlay...")); From 3daf7c3f8ef579a3d1347599f53e03941a838d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 4 Jun 2017 13:20:37 +0200 Subject: [PATCH 2/2] WX: Change GC IPL to GC "Main Menu" That is the official term used by Nintendo. --- Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp | 4 ++-- Source/Core/DolphinWX/MainMenuBar.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp index e901dc6eb6..2b904a684c 100644 --- a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp @@ -66,7 +66,7 @@ void GameCubeConfigPane::InitializeGUI() "Lets the system language be set to values that games were not designed for. This can allow " "the use of extra translations for a few games, but can also lead to text display issues.")); - m_skip_ipl_checkbox = new wxCheckBox(this, wxID_ANY, _("Skip IPL")); + m_skip_ipl_checkbox = new wxCheckBox(this, wxID_ANY, _("Skip Main Menu")); if (!File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) && !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) && @@ -76,7 +76,7 @@ void GameCubeConfigPane::InitializeGUI() !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL)) { m_skip_ipl_checkbox->Disable(); - m_skip_ipl_checkbox->SetToolTip(_("Put IPL roms in User/GC/{region}.")); + m_skip_ipl_checkbox->SetToolTip(_("Put Main Menu roms in User/GC/{region}.")); } // Device settings diff --git a/Source/Core/DolphinWX/MainMenuBar.cpp b/Source/Core/DolphinWX/MainMenuBar.cpp index d21686e40f..c82637159d 100644 --- a/Source/Core/DolphinWX/MainMenuBar.cpp +++ b/Source/Core/DolphinWX/MainMenuBar.cpp @@ -218,13 +218,13 @@ wxMenu* MainMenuBar::CreateToolsMenu() const tools_menu->AppendSeparator(); auto* const gc_bios_menu = new wxMenu; gc_bios_menu->Append(IDM_LOAD_GC_IPL_JAP, _("NTSC-J"), - _("Load NTSC-J GameCube IPL from the JAP folder.")); + _("Load NTSC-J GameCube Main Menu from the JAP folder.")); gc_bios_menu->Append(IDM_LOAD_GC_IPL_USA, _("NTSC-U"), - _("Load NTSC-U GameCube IPL from the USA folder.")); + _("Load NTSC-U GameCube Main Menu from the USA folder.")); gc_bios_menu->Append(IDM_LOAD_GC_IPL_EUR, _("PAL"), - _("Load PAL GameCube IPL from the EUR folder.")); - tools_menu->AppendSubMenu(gc_bios_menu, _("Load GameCube IPL"), - _("Load a GameCube IPL located under Dolphin's GC folder.")); + _("Load PAL GameCube Main Menu from the EUR folder.")); + tools_menu->AppendSubMenu(gc_bios_menu, _("Load GameCube Main Menu"), + _("Load a GameCube Main Menu located under Dolphin's GC folder.")); tools_menu->AppendSeparator(); tools_menu->Append(IDM_CHEATS, _("&Cheat Manager")); tools_menu->Append(IDM_NETPLAY, _("Start &NetPlay..."));