mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-26 15:49:50 -06:00
Merge pull request #1869 from Stevoisiak/GeneralConsistency
Minor consistency changes
This commit is contained in:
@ -296,8 +296,8 @@ wxStaticBoxSizer* ControllerConfigDiag::CreateRealWiimoteSizer()
|
||||
wxBoxSizer* const real_wiimotes_sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
||||
if (!WiimoteReal::g_wiimote_scanner.IsReady())
|
||||
real_wiimotes_group->Add(new wxStaticText(this, wxID_ANY, _("A supported bluetooth device could not be found.\n"
|
||||
"You must manually connect your wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5);
|
||||
real_wiimotes_group->Add(new wxStaticText(this, wxID_ANY, _("A supported Bluetooth device could not be found.\n"
|
||||
"You must manually connect your Wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5);
|
||||
|
||||
wxCheckBox* const continuous_scanning = new wxCheckBox(this, wxID_ANY, _("Continuous Scanning"));
|
||||
continuous_scanning->Bind(wxEVT_CHECKBOX, &ControllerConfigDiag::OnContinuousScanning, this);
|
||||
|
@ -1195,7 +1195,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
|
||||
// On OS X, we claim all keyboard events while
|
||||
// emulation is running to avoid wxWidgets sounding
|
||||
// the system beep for unhandled key events when
|
||||
// receiving pad/wiimote keypresses which take an
|
||||
// receiving pad/Wiimote keypresses which take an
|
||||
// entirely different path through the HID subsystem.
|
||||
#ifndef __APPLE__
|
||||
// On other platforms, we leave the key event alone
|
||||
@ -1205,7 +1205,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
|
||||
#endif
|
||||
}
|
||||
|
||||
// Actually perform the wiimote connection or disconnection
|
||||
// Actually perform the Wiimote connection or disconnection
|
||||
if (WiimoteId >= 0)
|
||||
{
|
||||
wxCommandEvent evt;
|
||||
|
@ -9,7 +9,7 @@
|
||||
#define PREVIEW_UPDATE_TIME 25
|
||||
#define DEFAULT_HIGH_VALUE 100
|
||||
|
||||
// might have to change this setup for wiimote
|
||||
// might have to change this setup for Wiimote
|
||||
#define PROFILES_PATH "Profiles/"
|
||||
|
||||
#include <cstddef>
|
||||
|
@ -125,7 +125,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
|
||||
"Netplay will only work with the following settings:\n"
|
||||
" - DSP Emulator Engine Must be the same on all computers!\n"
|
||||
" - DSP on Dedicated Thread [OFF]\n"
|
||||
" - Manually set the extensions for each wiimote\n"
|
||||
" - Manually set the extensions for each Wiimote\n"
|
||||
"\n"
|
||||
"All players should use the same Dolphin version and settings.\n"
|
||||
"All memory cards must be identical between players or disabled.\n"
|
||||
|
@ -220,7 +220,7 @@ protected:
|
||||
choice_backend->Disable();
|
||||
label_backend->Disable();
|
||||
|
||||
//D3D only
|
||||
// D3D only
|
||||
if (vconfig.backend_info.Adapters.size())
|
||||
{
|
||||
choice_adapter->Disable();
|
||||
@ -228,7 +228,7 @@ protected:
|
||||
}
|
||||
|
||||
#ifndef __APPLE__
|
||||
// This isn't supported on OSX.
|
||||
// This isn't supported on OS X.
|
||||
|
||||
choice_display_resolution->Disable();
|
||||
label_display_resolution->Disable();
|
||||
|
Reference in New Issue
Block a user