diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp index 8ded2cc800..ae77d5fb33 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp @@ -176,8 +176,8 @@ NetPlayDialog::NetPlayDialog(wxWindow* const parent, const CGameListCtrl* const player_szr->Add(m_kick_btn, 0, wxEXPAND | wxTOP, 5); m_kick_btn->Disable(); - m_player_config_btn = new wxButton(panel, wxID_ANY, _("Configure Pads")); - m_player_config_btn->Bind(wxEVT_BUTTON, &NetPlayDialog::OnConfigPads, this); + m_player_config_btn = new wxButton(panel, wxID_ANY, _("Assign Controller Ports")); + m_player_config_btn->Bind(wxEVT_BUTTON, &NetPlayDialog::OnAssignPads, this); player_szr->Add(m_player_config_btn, 0, wxEXPAND | wxTOP, 5); } @@ -460,7 +460,7 @@ void NetPlayDialog::OnChangeGame(wxCommandEvent&) m_game_btn->SetLabel(game_name.Prepend(_(" Game : "))); } -void NetPlayDialog::OnConfigPads(wxCommandEvent&) +void NetPlayDialog::OnAssignPads(wxCommandEvent&) { PadMapDialog pmd(this, netplay_server, netplay_client); pmd.ShowModal(); diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.h b/Source/Core/DolphinWX/NetPlay/NetWindow.h index 0d1223225f..a5c3d390c9 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.h +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.h @@ -69,7 +69,7 @@ private: void OnThread(wxThreadEvent& event); void OnChangeGame(wxCommandEvent& event); void OnAdjustBuffer(wxCommandEvent& event); - void OnConfigPads(wxCommandEvent& event); + void OnAssignPads(wxCommandEvent& event); void OnKick(wxCommandEvent& event); void OnPlayerSelect(wxCommandEvent& event); void GetNetSettings(NetSettings& settings); diff --git a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp index 8fdd66903e..4e3b382479 100644 --- a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp +++ b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp @@ -12,7 +12,7 @@ #include "DolphinWX/NetPlay/PadMapDialog.h" PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClient* client) - : wxDialog(parent, wxID_ANY, _("Configure Pads")) + : wxDialog(parent, wxID_ANY, _("Controller Ports")) , m_pad_mapping(server->GetPadMapping()) , m_wii_mapping(server->GetWiimoteMapping()) , m_player_list(client->GetPlayers()) @@ -28,7 +28,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClien for (unsigned int i = 0; i < 4; ++i) { wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL); - v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("Pad ")) + (wxChar)('0' + i))), + v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("GC Port ")) + (wxChar)('1' + i))), 1, wxALIGN_CENTER_HORIZONTAL); m_map_cbox[i] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names); @@ -55,7 +55,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClien for (unsigned int i = 0; i < 4; ++i) { wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL); - v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("Wiimote ")) + (wxChar)('0' + i))), + v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("Wiimote ")) + (wxChar)('1' + i))), 1, wxALIGN_CENTER_HORIZONTAL); m_map_cbox[i + 4] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names);