From 2267c84d6a6ff071fea59bebd68135523d979e78 Mon Sep 17 00:00:00 2001 From: David Kiarie Date: Sat, 12 Jul 2014 12:48:58 +0300 Subject: [PATCH] rpcs3/Gui:minor gui fixes Enable uses to go back after using VHDDManager or VFSManager by providing Ok and Cancel buttons otherwise I have to kill rpcs3 signed-off-by: asla --- rpcs3/Gui/VFSManager.cpp | 8 +++++++- rpcs3/Gui/VHDDManager.cpp | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rpcs3/Gui/VFSManager.cpp b/rpcs3/Gui/VFSManager.cpp index c9d3be671d..d1ba3365e4 100644 --- a/rpcs3/Gui/VFSManager.cpp +++ b/rpcs3/Gui/VFSManager.cpp @@ -120,8 +120,14 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent) { m_list = new wxListView(this); + wxBoxSizer* s_btns = new wxBoxSizer(wxHORIZONTAL); + s_btns->Add(new wxButton(this, wxID_OK)); + s_btns->AddSpacer(30); + s_btns->Add(new wxButton(this, wxID_CANCEL)); + wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); s_main->Add(m_list, 1, wxEXPAND); + s_main->Add(s_btns, 0, wxALL | wxCENTER, 10); SetSizerAndFit(s_main); SetSize(800, 600); @@ -136,7 +142,7 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent) Bind(wxEVT_MENU, &VFSManagerDialog::OnAdd, this, id_add); Bind(wxEVT_MENU, &VFSManagerDialog::OnRemove, this, id_remove); Bind(wxEVT_MENU, &VFSManagerDialog::OnEntryConfig, this, id_config); - Bind(wxEVT_CLOSE_WINDOW, &VFSManagerDialog::OnClose, this); + Bind(wxEVT_CLOSE_WINDOW, &VFSManagerDialog::OnClose, this, wxID_OK); LoadEntries(); UpdateList(); diff --git a/rpcs3/Gui/VHDDManager.cpp b/rpcs3/Gui/VHDDManager.cpp index 23c5e9974e..0f218e9634 100644 --- a/rpcs3/Gui/VHDDManager.cpp +++ b/rpcs3/Gui/VHDDManager.cpp @@ -382,8 +382,14 @@ VHDDManagerDialog::VHDDManagerDialog(wxWindow* parent) { m_list = new wxListView(this); + wxBoxSizer* s_btns = new wxBoxSizer(wxHORIZONTAL); + s_btns->Add(new wxButton(this, wxID_OK)); + s_btns->AddSpacer(30); + s_btns->Add(new wxButton(this, wxID_CANCEL)); + wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); s_main->Add(m_list, 1, wxEXPAND | wxALL, 5); + s_main->Add(s_btns, 0, wxALL | wxCENTER, 10); SetSizerAndFit(s_main); SetSize(800, 600); @@ -399,7 +405,7 @@ VHDDManagerDialog::VHDDManagerDialog(wxWindow* parent) Bind(wxEVT_MENU, &VHDDManagerDialog::OnOpen, this, id_open); Bind(wxEVT_MENU, &VHDDManagerDialog::OnRemove, this, id_remove); Bind(wxEVT_MENU, &VHDDManagerDialog::OnCreateHDD, this, id_create_hdd); - Bind(wxEVT_CLOSE_WINDOW, &VHDDManagerDialog::OnClose, this); + Bind(wxEVT_CLOSE_WINDOW, &VHDDManagerDialog::OnClose, this, wxID_OK); LoadPaths(); UpdateList(); }