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

Traversal: Add a read-only text for server:port with a "reset to default" button 

Clicking it will set the config file back to stun.dolphin-emu.org with
port 6262.
This commit is contained in:
mathieui 2015-05-11 01:09:44 +02:00
parent df8b86ed63
commit bb622836b2
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp
View File

@ -70,6 +70,10 @@ NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl
trav_szr->Add(m_direct_traversal, 0, wxRIGHT); trav_szr->Add(m_direct_traversal, 0, wxRIGHT);
m_trav_reset_btn = new wxButton(panel, wxID_ANY, _("Reset Traversal Settings"));
m_trav_reset_btn->Bind(wxEVT_BUTTON, &NetPlaySetupFrame::OnResetTraversal, this);
trav_szr->Add(m_trav_reset_btn, 0, wxCENTER | wxRIGHT);
wxBoxSizer* const nick_szr = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const nick_szr = new wxBoxSizer(wxHORIZONTAL);
wxStaticText* const nick_lbl = new wxStaticText(panel, wxID_ANY, _("Nickname :")); wxStaticText* const nick_lbl = new wxStaticText(panel, wxID_ANY, _("Nickname :"));
std::string nickname; std::string nickname;
@ -78,6 +82,13 @@ NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl
nick_szr->Add(nick_lbl, 0, wxCENTER); nick_szr->Add(nick_lbl, 0, wxCENTER);
nick_szr->Add(m_nickname_text, 0, wxALL, 5); nick_szr->Add(m_nickname_text, 0, wxALL, 5);
std::string centralPort;
GetTraversalPort(netplay_section, &centralPort);
std::string centralServer;
GetTraversalServer(netplay_section, &centralServer);
m_traversal_lbl = new wxStaticText(panel, wxID_ANY, _("Traversal: ") + centralServer + ":" + centralPort);
// tabs // tabs
wxNotebook* const notebook = new wxNotebook(panel, wxID_ANY); wxNotebook* const notebook = new wxNotebook(panel, wxID_ANY);
wxPanel* const connect_tab = new wxPanel(notebook, wxID_ANY); wxPanel* const connect_tab = new wxPanel(notebook, wxID_ANY);
@ -174,6 +185,7 @@ NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl
wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
main_szr->Add(trav_szr, 0, wxALL | wxALIGN_LEFT); main_szr->Add(trav_szr, 0, wxALL | wxALIGN_LEFT);
main_szr->Add(nick_szr, 0, wxALL | wxALIGN_LEFT, 5); main_szr->Add(nick_szr, 0, wxALL | wxALIGN_LEFT, 5);
main_szr->Add(m_traversal_lbl, 0, wxALL | wxALIGN_LEFT, 5);
main_szr->Add(notebook, 1, wxLEFT | wxRIGHT | wxEXPAND, 5); main_szr->Add(notebook, 1, wxLEFT | wxRIGHT | wxEXPAND, 5);
main_szr->Add(quit_btn, 0, wxALL | wxALIGN_RIGHT, 5); main_szr->Add(quit_btn, 0, wxALL | wxALIGN_RIGHT, 5);
@ -342,6 +354,19 @@ void NetPlaySetupFrame::OnJoin(wxCommandEvent&)
MakeNetPlayDiag(port, "", false); MakeNetPlayDiag(port, "", false);
} }
void NetPlaySetupFrame::OnResetTraversal(wxCommandEvent& event)
{
IniFile inifile;
const std::string dolphin_ini = File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini";
inifile.Load(dolphin_ini);
IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
netplay_section.Set("TraversalServer", (std::string) "stun.dolphin-emu.org");
netplay_section.Set("TraversalPort", (std::string) "6262");
inifile.Save(dolphin_ini);
m_traversal_lbl->SetLabelText(_("Traversal: ") + "stun.dolphin-emu.org:6262");
}
void NetPlaySetupFrame::OnChoice(wxCommandEvent& event) void NetPlaySetupFrame::OnChoice(wxCommandEvent& event)
{ {
int sel = m_direct_traversal->GetSelection(); int sel = m_direct_traversal->GetSelection();
@ -351,6 +376,8 @@ void NetPlaySetupFrame::OnChoice(wxCommandEvent& event)
if (sel == 1) if (sel == 1)
{ {
m_traversal_lbl->Show();
m_trav_reset_btn->Show();
//Traversal //Traversal
//client tab //client tab
{ {
@ -373,6 +400,8 @@ void NetPlaySetupFrame::OnChoice(wxCommandEvent& event)
} }
else else
{ {
m_traversal_lbl->Hide();
m_trav_reset_btn->Hide();
// Direct // Direct
// Client tab // Client tab
{ {

3
Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.h
View File

@ -26,6 +26,7 @@ private:
void OnHost(wxCommandEvent& event); void OnHost(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
void OnChoice(wxCommandEvent& event); void OnChoice(wxCommandEvent& event);
void OnResetTraversal(wxCommandEvent& event);
void MakeNetPlayDiag(int port, const std::string& game, bool is_hosting); void MakeNetPlayDiag(int port, const std::string& game, bool is_hosting);
@ -37,6 +38,8 @@ private:
wxTextCtrl* m_connect_port_text; wxTextCtrl* m_connect_port_text;
wxTextCtrl* m_connect_ip_text; wxTextCtrl* m_connect_ip_text;
wxChoice* m_direct_traversal; wxChoice* m_direct_traversal;
wxStaticText* m_traversal_lbl;
wxButton* m_trav_reset_btn;
wxListBox* m_game_lbox; wxListBox* m_game_lbox;
#ifdef USE_UPNP #ifdef USE_UPNP