From 5891266e6767add210079549080d0fe720b17826 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 10 Nov 2014 23:26:56 -0500 Subject: [PATCH 1/3] NetPlayDiag: Make the window title translateable --- Source/Core/DolphinWX/NetWindow.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp index bd959a59e7..fe8b19c8dd 100644 --- a/Source/Core/DolphinWX/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetWindow.cpp @@ -47,7 +47,6 @@ #include "DolphinWX/NetWindow.h" #include "DolphinWX/WxUtils.h" -#define NETPLAY_TITLEBAR "Dolphin NetPlay" #define INITIAL_PAD_BUFFER_SIZE 5 BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame) @@ -78,7 +77,7 @@ static void FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_li } NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* const game_list) - : wxFrame(parent, wxID_ANY, NETPLAY_TITLEBAR) + : wxFrame(parent, wxID_ANY, _("Dolphin NetPlay Setup")) , m_game_list(game_list) { IniFile inifile; @@ -305,7 +304,7 @@ void NetPlaySetupDiag::OnQuit(wxCommandEvent&) NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game_list, const std::string& game, const bool is_hosting) - : wxFrame(parent, wxID_ANY, NETPLAY_TITLEBAR) + : wxFrame(parent, wxID_ANY, _("Dolphin NetPlay")) , m_selected_game(game) , m_start_btn(nullptr) , m_game_list(game_list) From 3fed975bac11956ffc4d3eae86c928c7e0c921db Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 10 Nov 2014 23:28:09 -0500 Subject: [PATCH 2/3] NetPlayDiag: Get rid of event table --- Source/Core/DolphinWX/NetWindow.cpp | 12 ++++++------ Source/Core/DolphinWX/NetWindow.h | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp index fe8b19c8dd..66e2053e34 100644 --- a/Source/Core/DolphinWX/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetWindow.cpp @@ -49,10 +49,6 @@ #define INITIAL_PAD_BUFFER_SIZE 5 -BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame) - EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread) -END_EVENT_TABLE() - static NetPlayServer* netplay_server = nullptr; static NetPlayClient* netplay_client = nullptr; NetPlayDiag *NetPlayDiag::npd = nullptr; @@ -309,6 +305,8 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game , m_start_btn(nullptr) , m_game_list(game_list) { + Bind(wxEVT_THREAD, &NetPlayDiag::OnThread, this); + wxPanel* const panel = new wxPanel(this); // top crap @@ -534,7 +532,7 @@ void NetPlayDiag::OnQuit(wxCommandEvent&) } // update gui -void NetPlayDiag::OnThread(wxCommandEvent& event) +void NetPlayDiag::OnThread(wxThreadEvent& event) { // player list m_playerids.clear(); @@ -582,7 +580,9 @@ void NetPlayDiag::OnThread(wxCommandEvent& event) // update selected game :/ { m_selected_game.assign(WxStrToStr(event.GetString())); - m_game_btn->SetLabel(event.GetString().Prepend(_(" Game : "))); + + wxString button_label = event.GetString(); + m_game_btn->SetLabel(button_label.Prepend(_(" Game : "))); } break; case NP_GUI_EVT_START_GAME : diff --git a/Source/Core/DolphinWX/NetWindow.h b/Source/Core/DolphinWX/NetWindow.h index a0ea37e47d..90d0dbd8c4 100644 --- a/Source/Core/DolphinWX/NetWindow.h +++ b/Source/Core/DolphinWX/NetWindow.h @@ -82,11 +82,9 @@ public: bool IsRecording() override; private: - DECLARE_EVENT_TABLE() - void OnChat(wxCommandEvent& event); void OnQuit(wxCommandEvent& event); - void OnThread(wxCommandEvent& event); + void OnThread(wxThreadEvent& event); void OnChangeGame(wxCommandEvent& event); void OnAdjustBuffer(wxCommandEvent& event); void OnConfigPads(wxCommandEvent& event); From ec82f02580245548e41036666970be9c6977a046 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 11 Nov 2014 00:12:18 -0500 Subject: [PATCH 3/3] NetPlayDiag: Get rid of unnecessary text limit check The text control is limited to 2000 characters on creation. --- Source/Core/DolphinWX/NetWindow.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp index 66e2053e34..e925b19dc5 100644 --- a/Source/Core/DolphinWX/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetWindow.cpp @@ -425,9 +425,6 @@ void NetPlayDiag::OnChat(wxCommandEvent&) if (!text.empty()) { - if (text.length() > 2000) - text.erase(2000); - netplay_client->SendChatMessage(WxStrToStr(text)); m_chat_text->AppendText(text.Prepend(" >> ").Append('\n')); m_chat_msg_text->Clear();