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

Merge pull request #2205 from Stevoisiak/FormattingCleanup 

Formatting Cleanup
This commit is contained in:
magumagu 2015-03-16 17:47:29 -07:00
parent 629fb8fb49 4f71b717cc
commit 4b7748f3c0
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/ConfigMain.cpp
View File

@ -232,7 +232,7 @@ void CConfigMain::UpdateGUI()
EnableCheats->Disable(); EnableCheats->Disable();
CPUEngine->Disable(); CPUEngine->Disable();
_NTSCJ->Disable(); ForceNTSCJ->Disable();
// Disable stuff on AudioPage // Disable stuff on AudioPage
DSPEngine->Disable(); DSPEngine->Disable();
@ -347,7 +347,7 @@ void CConfigMain::InitializeGUIValues()
for (unsigned int a = 0; a < (sizeof(CPUCores) / sizeof(CPUCore)); ++a) for (unsigned int a = 0; a < (sizeof(CPUCores) / sizeof(CPUCore)); ++a)
if (CPUCores[a].CPUid == startup_params.iCPUCore) if (CPUCores[a].CPUid == startup_params.iCPUCore)
CPUEngine->SetSelection(a); CPUEngine->SetSelection(a);
_NTSCJ->SetValue(startup_params.bForceNTSCJ); ForceNTSCJ->SetValue(startup_params.bForceNTSCJ);
// Display - Interface // Display - Interface
@ -480,7 +480,7 @@ void CConfigMain::InitializeGUITooltips()
Framelimit->SetToolTip(_("Limits the game speed to the specified number of frames per second (full speed is 60 for NTSC and 50 for PAL).")); Framelimit->SetToolTip(_("Limits the game speed to the specified number of frames per second (full speed is 60 for NTSC and 50 for PAL)."));
// General - Advanced // General - Advanced
_NTSCJ->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nIf left unchecked, Dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games.")); ForceNTSCJ->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nIf left unchecked, Dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games."));
// Display - Interface // Display - Interface
ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game.")); ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game."));
@ -547,7 +547,7 @@ void CConfigMain::CreateGUIControls()
Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit); Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit);
// Core Settings - Advanced // Core Settings - Advanced
CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS); CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS);
_NTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J")); ForceNTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J"));
// Populate the General settings // Populate the General settings
wxBoxSizer* sFramelimit = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sFramelimit = new wxBoxSizer(wxHORIZONTAL);
@ -562,7 +562,7 @@ void CConfigMain::CreateGUIControls()
wxStaticBoxSizer* const sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings")); wxStaticBoxSizer* const sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings"));
sbAdvanced->Add(CPUEngine, 0, wxALL, 5); sbAdvanced->Add(CPUEngine, 0, wxALL, 5);
sbAdvanced->Add(_NTSCJ, 0, wxALL, 5); sbAdvanced->Add(ForceNTSCJ, 0, wxALL, 5);
wxBoxSizer* const sGeneralPage = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const sGeneralPage = new wxBoxSizer(wxVERTICAL);
sGeneralPage->Add(sbBasic, 0, wxEXPAND | wxALL, 5); sGeneralPage->Add(sbBasic, 0, wxEXPAND | wxALL, 5);
@ -906,7 +906,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
} }
break; break;
case ID_NTSCJ: case ID_NTSCJ:
startup_params.bForceNTSCJ = _NTSCJ->IsChecked(); startup_params.bForceNTSCJ = ForceNTSCJ->IsChecked();
break; break;
case ID_ENABLEOVERCLOCK: case ID_ENABLEOVERCLOCK:
SConfig::GetInstance().m_OCEnable = EnableOC->IsChecked(); SConfig::GetInstance().m_OCEnable = EnableOC->IsChecked();

2
Source/Core/DolphinWX/ConfigMain.h
View File

@ -146,7 +146,7 @@ private:
// Advanced // Advanced
wxRadioBox* CPUEngine; wxRadioBox* CPUEngine;
wxCheckBox* _NTSCJ; wxCheckBox* ForceNTSCJ;
wxSlider* OCSlider; wxSlider* OCSlider;
wxStaticText* OCText; wxStaticText* OCText;
wxCheckBox* EnableOC; wxCheckBox* EnableOC;

4
Source/Core/DolphinWX/Frame.cpp
View File

@ -432,7 +432,7 @@ CFrame::CFrame(wxFrame* parent,
m_GameListCtrl = new CGameListCtrl(m_Panel, wxID_ANY, m_GameListCtrl = new CGameListCtrl(m_Panel, wxID_ANY,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT); wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT);
m_GameListCtrl->Bind(wxEVT_LIST_ITEM_ACTIVATED, &CFrame::OnGameListCtrl_ItemActivated, this); m_GameListCtrl->Bind(wxEVT_LIST_ITEM_ACTIVATED, &CFrame::OnGameListCtrlItemActivated, this);
wxBoxSizer *sizerPanel = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *sizerPanel = new wxBoxSizer(wxHORIZONTAL);
sizerPanel->Add(m_GameListCtrl, 1, wxEXPAND | wxALL); sizerPanel->Add(m_GameListCtrl, 1, wxEXPAND | wxALL);
@ -864,7 +864,7 @@ bool CFrame::UIHasFocus()
return (focusWindow != nullptr); return (focusWindow != nullptr);
} }
void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED(event)) void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event))
{ {
// Show all platforms and regions if... // Show all platforms and regions if...
// 1. All platforms are set to hide // 1. All platforms are set to hide

2
Source/Core/DolphinWX/Frame.h
View File

@ -349,7 +349,7 @@ private:
void OnConnectWiimote(wxCommandEvent& event); void OnConnectWiimote(wxCommandEvent& event);
void GameListChanged(wxCommandEvent& event); void GameListChanged(wxCommandEvent& event);
void OnGameListCtrl_ItemActivated(wxListEvent& event); void OnGameListCtrlItemActivated(wxListEvent& event);
void OnRenderParentResize(wxSizeEvent& event); void OnRenderParentResize(wxSizeEvent& event);
void StartGame(const std::string& filename); void StartGame(const std::string& filename);
void OnChangeColumnsVisible(wxCommandEvent& event); void OnChangeColumnsVisible(wxCommandEvent& event);