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 #2947 from Rukario/my_branch 

Updated terms in Netplay window.
This commit is contained in:
flacs 2015-09-17 03:02:59 +02:00
parent 78cd1d749e e939fba3e7
commit 6940fc5ab9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/NetPlay/NetWindow.cpp
View File

@ -176,8 +176,8 @@ NetPlayDialog::NetPlayDialog(wxWindow* const parent, const CGameListCtrl* const
player_szr->Add(m_kick_btn, 0, wxEXPAND | wxTOP, 5); player_szr->Add(m_kick_btn, 0, wxEXPAND | wxTOP, 5);
m_kick_btn->Disable(); m_kick_btn->Disable();
m_player_config_btn = new wxButton(panel, wxID_ANY, _("Configure Pads")); m_player_config_btn = new wxButton(panel, wxID_ANY, _("Assign Controller Ports"));
m_player_config_btn->Bind(wxEVT_BUTTON, &NetPlayDialog::OnConfigPads, this); m_player_config_btn->Bind(wxEVT_BUTTON, &NetPlayDialog::OnAssignPads, this);
player_szr->Add(m_player_config_btn, 0, wxEXPAND | wxTOP, 5); 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 : "))); m_game_btn->SetLabel(game_name.Prepend(_(" Game : ")));
} }
void NetPlayDialog::OnConfigPads(wxCommandEvent&) void NetPlayDialog::OnAssignPads(wxCommandEvent&)
{ {
PadMapDialog pmd(this, netplay_server, netplay_client); PadMapDialog pmd(this, netplay_server, netplay_client);
pmd.ShowModal(); pmd.ShowModal();

2
Source/Core/DolphinWX/NetPlay/NetWindow.h
View File

@ -69,7 +69,7 @@ private:
void OnThread(wxThreadEvent& event); void OnThread(wxThreadEvent& event);
void OnChangeGame(wxCommandEvent& event); void OnChangeGame(wxCommandEvent& event);
void OnAdjustBuffer(wxCommandEvent& event); void OnAdjustBuffer(wxCommandEvent& event);
void OnConfigPads(wxCommandEvent& event); void OnAssignPads(wxCommandEvent& event);
void OnKick(wxCommandEvent& event); void OnKick(wxCommandEvent& event);
void OnPlayerSelect(wxCommandEvent& event); void OnPlayerSelect(wxCommandEvent& event);
void GetNetSettings(NetSettings& settings); void GetNetSettings(NetSettings& settings);

6
Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
View File

@ -12,7 +12,7 @@
#include "DolphinWX/NetPlay/PadMapDialog.h" #include "DolphinWX/NetPlay/PadMapDialog.h"
PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClient* client) 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_pad_mapping(server->GetPadMapping())
, m_wii_mapping(server->GetWiimoteMapping()) , m_wii_mapping(server->GetWiimoteMapping())
, m_player_list(client->GetPlayers()) , m_player_list(client->GetPlayers())
@ -28,7 +28,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClien
for (unsigned int i = 0; i < 4; ++i) for (unsigned int i = 0; i < 4; ++i)
{ {
wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL); 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); 1, wxALIGN_CENTER_HORIZONTAL);
m_map_cbox[i] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names); 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) for (unsigned int i = 0; i < 4; ++i)
{ {
wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL); 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); 1, wxALIGN_CENTER_HORIZONTAL);
m_map_cbox[i + 4] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names); m_map_cbox[i + 4] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names);