From 83437e59e2418485fb108f56d4c01e7e4656a6ac Mon Sep 17 00:00:00 2001 From: Zangetsu38 Date: Mon, 23 Nov 2015 00:47:08 +0100 Subject: [PATCH] Some Change in Gui. --- rpcs3/Emu/RSX/rsx_methods.cpp | 2 +- rpcs3/Gui/AboutDialog.h | 4 +- rpcs3/Gui/AutoPauseManager.cpp | 16 +++---- rpcs3/Gui/CgDisasm.cpp | 6 +-- rpcs3/Gui/CompilerELF.cpp | 6 +-- rpcs3/Gui/DisAsmFrame.cpp | 4 +- rpcs3/Gui/FrameBase.h | 2 +- rpcs3/Gui/GameViewer.cpp | 4 +- rpcs3/Gui/GameViewer.h | 8 ++-- rpcs3/Gui/InterpreterDisAsm.cpp | 4 +- rpcs3/Gui/KernelExplorer.cpp | 40 ++++++++-------- rpcs3/Gui/LLEModulesManager.cpp | 6 +-- rpcs3/Gui/MainFrame.cpp | 36 +++++++------- rpcs3/Gui/MemoryStringSearcher.cpp | 2 +- rpcs3/Gui/MemoryViewer.cpp | 6 +-- rpcs3/Gui/PADManager.cpp | 28 +++++------ rpcs3/Gui/RSXDebugger.cpp | 76 +++++++++++++++--------------- rpcs3/Gui/SettingsDialog.cpp | 40 ++++++++-------- rpcs3/Gui/VFSManager.cpp | 4 +- rpcs3/Gui/VHDDManager.cpp | 16 +++---- rpcs3/config.h | 68 +++++++++++++------------- 21 files changed, 189 insertions(+), 189 deletions(-) diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index 3529418999..fc9a6a8f02 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -684,9 +684,9 @@ namespace rsx double limit; switch (rpcs3::state.config.rsx.frame_limit.value()) { + case rsx_frame_limit::_30: limit = 30.; break; case rsx_frame_limit::_50: limit = 50.; break; case rsx_frame_limit::_59_94: limit = 59.94; break; - case rsx_frame_limit::_30: limit = 30.; break; case rsx_frame_limit::_60: limit = 60.; break; case rsx_frame_limit::Auto: limit = rsx->fps_limit; break; //TODO diff --git a/rpcs3/Gui/AboutDialog.h b/rpcs3/Gui/AboutDialog.h index b8471ed69a..581e5ec615 100644 --- a/rpcs3/Gui/AboutDialog.h +++ b/rpcs3/Gui/AboutDialog.h @@ -25,7 +25,7 @@ public: t_name->SetForegroundColour(wxColor(255, 255, 255)); t_name->SetPosition(wxPoint(10, 6)); - wxStaticText* t_descr = new wxStaticText(this, wxID_ANY, "An early but promising PS3 emulator and debugger."); + wxStaticText* t_descr = new wxStaticText(this, wxID_ANY, "A PlayStation 3 emulator and debugger."); t_descr->SetBackgroundColour(wxColor(100, 100, 100)); t_descr->SetForegroundColour(wxColor(255, 255, 255)); t_descr->SetPosition(wxPoint(12, 50)); @@ -62,7 +62,7 @@ public: s_panel_buttons->AddStretchSpacer(); s_panel_buttons->Add(b_forum, 16, 0, 5); s_panel_buttons->AddStretchSpacer(20); - s_panel_buttons->Add(new wxButton(this, wxID_OK), 16, 0, 5); + s_panel_buttons->Add(new wxButton(this, wxID_OK, "Close") , 16, 0, 5); s_panel_buttons->AddSpacer(12); //Panels diff --git a/rpcs3/Gui/AutoPauseManager.cpp b/rpcs3/Gui/AutoPauseManager.cpp index 0b3d5ac8ef..b76a5dfae7 100644 --- a/rpcs3/Gui/AutoPauseManager.cpp +++ b/rpcs3/Gui/AutoPauseManager.cpp @@ -5,13 +5,13 @@ //TODO::Get the enable configuration from ini. AutoPauseManagerDialog::AutoPauseManagerDialog(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "Auto Pause Manager") + : wxDialog(parent, wxID_ANY, "Automatic pause settings") { SetMinSize(wxSize(400, 360)); wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); - wxStaticText* s_description = new wxStaticText(this, wxID_ANY, "To use auto pause: enter the ID(s) of a function or a system call. Restart of the game is required to apply. You can enable/disable this in the settings.", wxDefaultPosition, wxDefaultSize, 0); + wxStaticText* s_description = new wxStaticText(this, wxID_ANY, "To use auto pause: enter the ID(s) of a function or a system call. You must restart your emulated game or application for changed settings to take effect. You can enable/disable this in the settings.", wxDefaultPosition, wxDefaultSize, 0); s_description->Wrap(400); s_main->Add(s_description, 0, wxALL, 5); @@ -114,11 +114,11 @@ void AutoPauseManagerDialog::UpdateList(void) if (m_entries[i] < 1024) { - m_list->SetItem(i, 1, "System Call"); + m_list->SetItem(i, 1, "System call"); } else { - m_list->SetItem(i, 1, "Function Call"); + m_list->SetItem(i, 1, "Function call"); } } m_list->SetColumnWidth(0, wxLIST_AUTOSIZE_USEHEADER); @@ -176,7 +176,7 @@ void AutoPauseManagerDialog::OnRemove(wxCommandEvent& event) void AutoPauseManagerDialog::OnSave(wxCommandEvent& event) { SaveEntries(); - LOG_SUCCESS(HLE,"Auto Pause: File pause.bin was updated."); + LOG_SUCCESS(HLE,"Automatic pause: file pause.bin was updated."); //event.Skip(); } @@ -193,7 +193,7 @@ void AutoPauseManagerDialog::OnReload(wxCommandEvent& event) } AutoPauseSettingsDialog::AutoPauseSettingsDialog(wxWindow* parent, u32 *entry) - : wxDialog(parent, wxID_ANY, "Auto Pause Setting") + : wxDialog(parent, wxID_ANY, "Automatic pause Setting") , m_presult(entry) { m_entry = *m_presult; @@ -202,7 +202,7 @@ AutoPauseSettingsDialog::AutoPauseSettingsDialog(wxWindow* parent, u32 *entry) wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); - wxStaticText* s_description = new wxStaticText(this, wxID_ANY, "Specify ID of System Call or Function Call below. You need to use a Hexadecimal ID.", wxDefaultPosition, wxDefaultSize, 0); + wxStaticText* s_description = new wxStaticText(this, wxID_ANY, "Specify ID of system call or function call below. You need to use a hexadecimal ID.", wxDefaultPosition, wxDefaultSize, 0); s_description->Wrap(400); s_main->Add(s_description, 0, wxALL, 5); @@ -220,7 +220,7 @@ AutoPauseSettingsDialog::AutoPauseSettingsDialog(wxWindow* parent, u32 *entry) m_id->SetValue(fmt::format("%08x", m_entry)); - SetTitle("Auto Pause Setting: " + m_id->GetValue()); + SetTitle("Automatic pause setting: " + m_id->GetValue()); Bind(wxEVT_BUTTON, &AutoPauseSettingsDialog::OnOk, this, wxID_OK); Bind(wxEVT_TEXT, &AutoPauseSettingsDialog::OnUpdateValue, this, wxID_STATIC); diff --git a/rpcs3/Gui/CgDisasm.cpp b/rpcs3/Gui/CgDisasm.cpp index cc57e2b4d1..1ff84a31a1 100644 --- a/rpcs3/Gui/CgDisasm.cpp +++ b/rpcs3/Gui/CgDisasm.cpp @@ -10,13 +10,13 @@ BEGIN_EVENT_TABLE(CgDisasm, wxFrame) END_EVENT_TABLE() CgDisasm::CgDisasm(wxWindow* parent) - : wxFrame(parent, wxID_ANY, "Cg Disasm", wxDefaultPosition, wxSize(640, 480)) + : wxFrame(parent, wxID_ANY, "Cg disassembler", wxDefaultPosition, wxSize(640, 480)) { wxMenuBar* menubar = new wxMenuBar(); wxMenu* menu_general = new wxMenu(); - menubar->Append(menu_general, "&Open"); - menu_general->Append(id_open_file, "Open &Cg binary program"); + menubar->Append(menu_general, "&File"); + menu_general->Append(id_open_file, "Open &Cg binary"); wxNotebook* nb_cg = new wxNotebook(this, wxID_ANY); wxPanel* p_cg_disasm = new wxPanel(nb_cg, wxID_ANY); diff --git a/rpcs3/Gui/CompilerELF.cpp b/rpcs3/Gui/CompilerELF.cpp index 999ebbf7c4..38c4941bb5 100644 --- a/rpcs3/Gui/CompilerELF.cpp +++ b/rpcs3/Gui/CompilerELF.cpp @@ -19,7 +19,7 @@ wxFont GetFont(int size) } CompilerELF::CompilerELF(wxWindow* parent) - : FrameBase(parent, wxID_ANY, "CompilerELF", "", wxSize(640, 680)) + : FrameBase(parent, wxID_ANY, "ELF compiler", "", wxSize(640, 680)) , m_status_bar(*CreateStatusBar()) { m_disable_scroll = false; @@ -28,11 +28,11 @@ CompilerELF::CompilerELF(wxWindow* parent) wxMenuBar* menubar = new wxMenuBar(); wxMenu* menu_code = new wxMenu(); - menubar->Append(menu_code, "Code"); + menubar->Append(menu_code, "File"); //menu_code.Append(id_analyze_code, "Analyze"); - menu_code->Append(id_compile_code, "Compile"); menu_code->Append(id_load_elf, "Load ELF"); + menu_code->Append(id_compile_code, "Compile"); SetMenuBar(menubar); asm_list = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(400, -1), wxTE_MULTILINE | wxTE_DONTWRAP | wxTE_RICH2); diff --git a/rpcs3/Gui/DisAsmFrame.cpp b/rpcs3/Gui/DisAsmFrame.cpp index 090df0493a..9d5c3fc2a7 100644 --- a/rpcs3/Gui/DisAsmFrame.cpp +++ b/rpcs3/Gui/DisAsmFrame.cpp @@ -125,7 +125,7 @@ class DumperThread : public ThreadBase wxArrayString** arr; public: - DumperThread() : ThreadBase("DumperThread") + DumperThread() : ThreadBase("Dumper thread") { } @@ -204,7 +204,7 @@ struct WaitDumperThread : public ThreadBase wxArrayString** arr; WaitDumperThread(bool* _done, u8 _cores, wxString _patch, MTProgressDialog& _prog_dial, wxArrayString** _arr) - : ThreadBase("WaitDumperThread") + : ThreadBase("Wait dumper thread") , done(_done) , cores(_cores) , patch(_patch) diff --git a/rpcs3/Gui/FrameBase.h b/rpcs3/Gui/FrameBase.h index 3cfbce517d..0bbf0de597 100644 --- a/rpcs3/Gui/FrameBase.h +++ b/rpcs3/Gui/FrameBase.h @@ -10,7 +10,7 @@ protected: FrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, - const wxString& framename = "UnknownFrame", + const wxString& framename = "Unknown frame", const std::string& ininame = "", wxSize defsize = wxDefaultSize, wxPoint defposition = wxDefaultPosition, diff --git a/rpcs3/Gui/GameViewer.cpp b/rpcs3/Gui/GameViewer.cpp index 43bbe23d3d..5030b07bc3 100644 --- a/rpcs3/Gui/GameViewer.cpp +++ b/rpcs3/Gui/GameViewer.cpp @@ -11,7 +11,7 @@ #include "SettingsDialog.h" #include -static const std::string m_class_name = "GameViewer"; +static const std::string m_class_name = "Game viewer"; // Auxiliary classes class sortGameData @@ -237,7 +237,7 @@ void GameViewer::RightClick(wxListEvent& event) #endif m_popup->Append(boot_item); m_popup->Append(1, _T("Configure")); - m_popup->Append(2, _T("Remove Game")); + m_popup->Append(2, _T("Remove game")); Bind(wxEVT_MENU, &GameViewer::BootGame, this, 0); Bind(wxEVT_MENU, &GameViewer::ConfigureGame, this, 1); diff --git a/rpcs3/Gui/GameViewer.h b/rpcs3/Gui/GameViewer.h index e7cd287ed2..b78975ccaa 100644 --- a/rpcs3/Gui/GameViewer.h +++ b/rpcs3/Gui/GameViewer.h @@ -87,12 +87,12 @@ public: m_img_list = new wxImageList(80, 44); m_columns.clear(); - m_columns.emplace_back(m_columns.size(), 90, "Icon"); + m_columns.emplace_back(m_columns.size(), 90, ""); m_columns.emplace_back(m_columns.size(), 160, "Name"); m_columns.emplace_back(m_columns.size(), 85, "Serial"); - m_columns.emplace_back(m_columns.size(), 55, "FW"); - m_columns.emplace_back(m_columns.size(), 55, "App version"); - m_columns.emplace_back(m_columns.size(), 75, "Category"); + m_columns.emplace_back(m_columns.size(), 60, "Min. FW"); + m_columns.emplace_back(m_columns.size(), 80, "Soft. version"); + m_columns.emplace_back(m_columns.size(), 75, "Soft. type"); m_columns.emplace_back(m_columns.size(), 160, "Path"); m_col_icon = &m_columns[0]; m_col_name = &m_columns[1]; diff --git a/rpcs3/Gui/InterpreterDisAsm.cpp b/rpcs3/Gui/InterpreterDisAsm.cpp index 098d77c0b2..fc693a79e6 100644 --- a/rpcs3/Gui/InterpreterDisAsm.cpp +++ b/rpcs3/Gui/InterpreterDisAsm.cpp @@ -34,8 +34,8 @@ InterpreterDisAsmFrame::InterpreterDisAsmFrame(wxWindow* parent) m_list = new wxListView(this); m_choice_units = new wxChoice(this, wxID_ANY); - wxButton* b_go_to_addr = new wxButton(this, wxID_ANY, "Go To Address"); - wxButton* b_go_to_pc = new wxButton(this, wxID_ANY, "Go To PC"); + wxButton* b_go_to_addr = new wxButton(this, wxID_ANY, "Go to address"); + wxButton* b_go_to_pc = new wxButton(this, wxID_ANY, "Go to PC"); m_btn_step = new wxButton(this, wxID_ANY, "Step"); m_btn_run = new wxButton(this, wxID_ANY, "Run"); diff --git a/rpcs3/Gui/KernelExplorer.cpp b/rpcs3/Gui/KernelExplorer.cpp index ef906b1d16..a2f6a67767 100644 --- a/rpcs3/Gui/KernelExplorer.cpp +++ b/rpcs3/Gui/KernelExplorer.cpp @@ -23,7 +23,7 @@ #include "KernelExplorer.h" KernelExplorer::KernelExplorer(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "Kernel Explorer", wxDefaultPosition, wxSize(700, 450)) + : wxDialog(parent, wxID_ANY, "Kernel explorer", wxDefaultPosition, wxSize(700, 450)) { this->SetBackgroundColour(wxColour(240,240,240)); //This fix the ugly background color under Windows wxBoxSizer* s_panel = new wxBoxSizer(wxVERTICAL); @@ -59,7 +59,7 @@ void KernelExplorer::Update() m_tree->DeleteAllItems(); const u32 total_memory_usage = vm::get(vm::user_space)->used.load(); - const auto& root = m_tree->AddRoot(fmt::format("Process, ID = 0x00000001, Total Memory Usage = 0x%x (%0.2f MB)", total_memory_usage, (float)total_memory_usage / (1024 * 1024))); + const auto& root = m_tree->AddRoot(fmt::format("Process, ID = 0x00000001, Total memory usage = 0x%x (%0.2f MB)", total_memory_usage, (float)total_memory_usage / (1024 * 1024))); union name64 { @@ -116,7 +116,7 @@ void KernelExplorer::Update() if (lwm_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("Lightweight Mutexes (%zu)", lwm_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("Lightweight mutexes (%zu)", lwm_map.size())); for (const auto& data : lwm_map) { @@ -132,7 +132,7 @@ void KernelExplorer::Update() if (cond_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("Condition Variables (%zu)", cond_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("Condition variables (%zu)", cond_map.size())); for (const auto& data : cond_map) { @@ -148,7 +148,7 @@ void KernelExplorer::Update() if (lwc_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("Lightweight Condition Variables (%zu)", lwc_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("Lightweight condition variables (%zu)", lwc_map.size())); for (const auto& data : lwc_map) { @@ -164,7 +164,7 @@ void KernelExplorer::Update() if (eq_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("Event Queues (%zu)", eq_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("Event queues (%zu)", eq_map.size())); for (const auto& data : eq_map) { @@ -180,13 +180,13 @@ void KernelExplorer::Update() if (ep_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("Event Ports (%zu)", ep_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("Event ports (%zu)", ep_map.size())); for (const auto& data : ep_map) { const auto& ep = *data.second; - m_tree->AppendItem(node, fmt::format("Event Port: ID = 0x%08x, Name = %#llx", data.first, + m_tree->AppendItem(node, fmt::format("Event port: ID = 0x%08x, Name = %#llx", data.first, ep.name)); } } @@ -196,13 +196,13 @@ void KernelExplorer::Update() if (ef_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("Event Flags (%zu)", ef_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("Event flags (%zu)", ef_map.size())); for (const auto& data : ef_map) { const auto& ef = *data.second; - m_tree->AppendItem(node, fmt::format("Event Flag: ID = 0x%08x", data.first)); + m_tree->AppendItem(node, fmt::format("Event flag: ID = 0x%08x", data.first)); } } @@ -211,7 +211,7 @@ void KernelExplorer::Update() if (rwlock_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("Reader/writer Locks (%zu)", rwlock_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("Reader/writer locks (%zu)", rwlock_map.size())); for (const auto& data : rwlock_map) { @@ -226,7 +226,7 @@ void KernelExplorer::Update() if (prx_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("PRX Libraries (%zu)", prx_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("PRX libraries (%zu)", prx_map.size())); for (const auto& data : prx_map) { @@ -241,13 +241,13 @@ void KernelExplorer::Update() if (ct_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("Memory Containers (%zu)", ct_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("Memory containers (%zu)", ct_map.size())); for (const auto& data : ct_map) { const auto& ct = *data.second; - m_tree->AppendItem(node, fmt::format("Memory Container: ID = 0x%08x", data.first)); + m_tree->AppendItem(node, fmt::format("Memory container: ID = 0x%08x", data.first)); } } @@ -256,13 +256,13 @@ void KernelExplorer::Update() if (mem_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("Memory Objects (%zu)", mem_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("Memory objects (%zu)", mem_map.size())); for (const auto& data : mem_map) { const auto& mem = *data.second; - m_tree->AppendItem(node, fmt::format("Memory Object: ID = 0x%08x", data.first)); + m_tree->AppendItem(node, fmt::format("Memory object: ID = 0x%08x", data.first)); } } @@ -271,13 +271,13 @@ void KernelExplorer::Update() if (ppu_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("PPU Threads (%zu)", ppu_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("PPU threads (%zu)", ppu_map.size())); for (const auto& data : ppu_map) { const auto& ppu = *data.second; - m_tree->AppendItem(node, fmt::format("PPU Thread: ID = 0x%08x '%s', - %s", data.first, + m_tree->AppendItem(node, fmt::format("PPU thread: ID = 0x%08x '%s', - %s", data.first, ppu.get_name().c_str(), ppu.ThreadStatusToString())); } } @@ -287,13 +287,13 @@ void KernelExplorer::Update() if (spu_map.size()) { - const auto& node = m_tree->AppendItem(root, fmt::format("SPU Thread Groups (%d)", spu_map.size())); + const auto& node = m_tree->AppendItem(root, fmt::format("SPU thread groups (%d)", spu_map.size())); for (const auto& data : spu_map) { const auto& tg = *data.second; - m_tree->AppendItem(node, fmt::format("SPU Thread Group: ID = 0x%08x '%s'", data.first, + m_tree->AppendItem(node, fmt::format("SPU thread group: ID = 0x%08x '%s'", data.first, tg.name.c_str())); } } diff --git a/rpcs3/Gui/LLEModulesManager.cpp b/rpcs3/Gui/LLEModulesManager.cpp index 9f47b9a202..4bc41fb520 100644 --- a/rpcs3/Gui/LLEModulesManager.cpp +++ b/rpcs3/Gui/LLEModulesManager.cpp @@ -9,7 +9,7 @@ #include "Emu/FS/VFS.h" LLEModulesManagerFrame::LLEModulesManagerFrame(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "LLEModulesManagerFrame", wxDefaultPosition, wxSize(480, 640)) + : wxDialog(parent, wxID_ANY, "Modules LLE manager", wxDefaultPosition, wxSize(480, 640)) { wxBoxSizer *s_panel = new wxBoxSizer(wxVERTICAL); wxBoxSizer *s_p_panel = new wxBoxSizer(wxVERTICAL); @@ -18,8 +18,8 @@ LLEModulesManagerFrame::LLEModulesManagerFrame(wxWindow* parent) // select / unselect wxStaticBoxSizer* s_selection = new wxStaticBoxSizer(wxHORIZONTAL, p_main); - wxButton* b_select = new wxButton(p_main, wxID_ANY, "Select All", wxDefaultPosition, wxSize(80, -1)); - wxButton* b_unselect = new wxButton(p_main, wxID_ANY, "Unselect All", wxDefaultPosition, wxSize(80, -1)); + wxButton* b_select = new wxButton(p_main, wxID_ANY, "Select all", wxDefaultPosition, wxSize(80, -1)); + wxButton* b_unselect = new wxButton(p_main, wxID_ANY, "Unselect all", wxDefaultPosition, wxSize(80, -1)); s_selection->Add(b_select); s_selection->Add(b_unselect); diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index 5f9be47e18..25dec11f33 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -79,7 +79,7 @@ MainFrame::MainFrame() wxMenuBar* menubar = new wxMenuBar(); wxMenu* menu_boot = new wxMenu(); - menubar->Append(menu_boot, "&Boot"); + menubar->Append(menu_boot, "&File"); menu_boot->Append(id_boot_elf, "Boot &ELF / SELF file"); menu_boot->Append(id_boot_game, "Boot &game"); menu_boot->AppendSeparator(); @@ -92,30 +92,30 @@ MainFrame::MainFrame() menu_sys->Append(id_sys_pause, "&Pause")->Enable(false); menu_sys->Append(id_sys_stop, "&Stop\tCtrl + S")->Enable(false); menu_sys->AppendSeparator(); - menu_sys->Append(id_sys_send_open_menu, "Send &open system menu cmd")->Enable(false); + menu_sys->Append(id_sys_send_open_menu, "Press &PS button")->Enable(false); menu_sys->Append(id_sys_send_exit, "Send &exit cmd")->Enable(false); wxMenu* menu_conf = new wxMenu(); menubar->Append(menu_conf, "&Config"); menu_conf->Append(id_config_emu, "&Settings"); - menu_conf->Append(id_config_pad, "&PAD Settings"); + menu_conf->Append(id_config_pad, "&Controller settings"); menu_conf->AppendSeparator(); - menu_conf->Append(id_config_autopause_manager, "&Auto Pause Settings"); + menu_conf->Append(id_config_autopause_manager, "&Auto pause settings"); menu_conf->AppendSeparator(); - menu_conf->Append(id_config_vfs_manager, "Virtual &File System Manager"); - menu_conf->Append(id_config_vhdd_manager, "Virtual &HDD Manager"); - menu_conf->Append(id_config_savedata_manager, "Save &Data Utility"); - menu_conf->Append(id_config_lle_modules_manager, "&LLE Modules Manager"); + menu_conf->Append(id_config_vfs_manager, "Virtual &file system manager"); + menu_conf->Append(id_config_vhdd_manager, "Virtual &hard drive manager"); + menu_conf->Append(id_config_savedata_manager, "Save &data manager"); + menu_conf->Append(id_config_lle_modules_manager, "Modules &LLE manager"); wxMenu* menu_tools = new wxMenu(); menubar->Append(menu_tools, "&Tools"); - menu_tools->Append(id_tools_compiler, "&ELF Compiler"); - menu_tools->Append(id_tools_kernel_explorer, "&Kernel Explorer")->Enable(false); - menu_tools->Append(id_tools_memory_viewer, "&Memory Viewer")->Enable(false); - menu_tools->Append(id_tools_rsx_debugger, "&RSX Debugger")->Enable(false); - menu_tools->Append(id_tools_string_search, "&String Search")->Enable(false); - menu_tools->Append(id_tools_cg_disasm, "&Cg Disasm")->Enable(); + menu_tools->Append(id_tools_compiler, "&ELF compiler"); + menu_tools->Append(id_tools_kernel_explorer, "&Kernel explorer")->Enable(false); + menu_tools->Append(id_tools_memory_viewer, "&Memory viewer")->Enable(false); + menu_tools->Append(id_tools_rsx_debugger, "&RSX debugger")->Enable(false); + menu_tools->Append(id_tools_string_search, "&String search")->Enable(false); + menu_tools->Append(id_tools_cg_disasm, "&Cg disassembler")->Enable(); wxMenu* menu_help = new wxMenu(); menubar->Append(menu_help, "&Help"); @@ -129,7 +129,7 @@ MainFrame::MainFrame() m_game_viewer = new GameViewer(this); m_debugger_frame = new DebuggerPanel(this); - AddPane(m_game_viewer, "Game List", wxAUI_DOCK_CENTRE); + AddPane(m_game_viewer, "PS3 software", wxAUI_DOCK_CENTRE); AddPane(m_log_frame, "Log", wxAUI_DOCK_BOTTOM); AddPane(m_debugger_frame, "Debugger", wxAUI_DOCK_RIGHT); @@ -532,7 +532,7 @@ void MainFrame::UpdateUI(wxCommandEvent& event) // Emulation wxMenuItem& pause = *menubar.FindItem(id_sys_pause); wxMenuItem& stop = *menubar.FindItem(id_sys_stop); - pause.SetItemLabel(is_running ? "&Pause\tCtrl + P" : is_ready ? "&Start\tCtrl + E" : "&Resume\tCtrl + E"); + pause.SetItemLabel(is_running ? "&Pause\tCtrl + P" : is_ready ? "&Start\tCtrl + F" : "&Resume\tCtrl + F"); pause.Enable(!is_stopped); stop.Enable(!is_stopped); @@ -540,7 +540,7 @@ void MainFrame::UpdateUI(wxCommandEvent& event) wxMenuItem& send_exit = *menubar.FindItem(id_sys_send_exit); wxMenuItem& send_open_menu = *menubar.FindItem(id_sys_send_open_menu); bool enable_commands = !is_stopped; - send_open_menu.SetItemLabel(wxString::Format("Send &%s system menu cmd", (m_sys_menu_opened ? "close" : "open"))); + send_open_menu.SetItemLabel(wxString::Format("Press &PS buton %s", (m_sys_menu_opened ? "close" : "open"))); send_open_menu.Enable(enable_commands); send_exit.Enable(enable_commands); @@ -567,7 +567,7 @@ void MainFrame::OnKeyDown(wxKeyEvent& event) { switch(event.GetKeyCode()) { - case 'E': case 'e': if(Emu.IsPaused()) Emu.Resume(); else if(Emu.IsReady()) Emu.Run(); return; + case 'F': case 'f': if(Emu.IsPaused()) Emu.Resume(); else if(Emu.IsReady()) Emu.Run(); return; case 'P': case 'p': if(Emu.IsRunning()) Emu.Pause(); return; case 'S': case 's': if(!Emu.IsStopped()) Emu.Stop(); return; case 'R': case 'r': if(!Emu.GetPath().empty()) {Emu.Stop(); Emu.Run();} return; diff --git a/rpcs3/Gui/MemoryStringSearcher.cpp b/rpcs3/Gui/MemoryStringSearcher.cpp index 184cce2c99..3ec3f00700 100644 --- a/rpcs3/Gui/MemoryStringSearcher.cpp +++ b/rpcs3/Gui/MemoryStringSearcher.cpp @@ -9,7 +9,7 @@ #include MemoryStringSearcher::MemoryStringSearcher(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "String Searcher", wxDefaultPosition, wxSize(545, 64)) + : wxDialog(parent, wxID_ANY, "String searcher", wxDefaultPosition, wxSize(545, 64)) , exit(false) { this->SetBackgroundColour(wxColour(240,240,240)); diff --git a/rpcs3/Gui/MemoryViewer.cpp b/rpcs3/Gui/MemoryViewer.cpp index a09f8fdc76..54e887d7ac 100644 --- a/rpcs3/Gui/MemoryViewer.cpp +++ b/rpcs3/Gui/MemoryViewer.cpp @@ -19,7 +19,7 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent) wxBoxSizer* s_tools = new wxBoxSizer(wxHORIZONTAL); //Tools: Memory Viewer Options - wxStaticBoxSizer* s_tools_mem = new wxStaticBoxSizer(wxHORIZONTAL, this, "Memory Viewer Options"); + wxStaticBoxSizer* s_tools_mem = new wxStaticBoxSizer(wxHORIZONTAL, this, "Memory viewer options"); wxStaticBoxSizer* s_tools_mem_addr = new wxStaticBoxSizer(wxHORIZONTAL, this, "Address"); t_addr = new wxTextCtrl(this, wxID_ANY, "00000000", wxDefaultPosition, wxSize(60, -1), wxTE_PROCESS_ENTER); @@ -46,7 +46,7 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent) s_tools_mem->Add(s_tools_mem_buttons); //Tools: Raw Image Preview Options - wxStaticBoxSizer* s_tools_img = new wxStaticBoxSizer(wxHORIZONTAL, this, "Raw Image Preview"); + wxStaticBoxSizer* s_tools_img = new wxStaticBoxSizer(wxHORIZONTAL, this, "Raw image preview"); wxStaticBoxSizer* s_tools_img_size = new wxStaticBoxSizer(wxHORIZONTAL, this, "Size"); sc_img_size_x = new wxSpinCtrl(this, wxID_ANY, "256", wxDefaultPosition, wxSize(60, -1)); @@ -223,7 +223,7 @@ void MemoryViewerPanel::ShowMemory() void MemoryViewerPanel::ShowImage(wxWindow* parent, u32 addr, int mode, u32 width, u32 height, bool flipv) { - wxString title = wxString::Format("Raw Image @ 0x%x", addr); + wxString title = wxString::Format("Raw image @ 0x%x", addr); wxDialog* f_image_viewer = new wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxMINIMIZE_BOX | wxCLOSE_BOX | wxCAPTION | wxCLIP_CHILDREN); f_image_viewer->SetBackgroundColour(wxColour(240,240,240)); //This fix the ugly background color under Windows diff --git a/rpcs3/Gui/PADManager.cpp b/rpcs3/Gui/PADManager.cpp index 0ff406ba1b..5b2bb2bffe 100644 --- a/rpcs3/Gui/PADManager.cpp +++ b/rpcs3/Gui/PADManager.cpp @@ -7,7 +7,7 @@ #include "PADManager.h" PADManager::PADManager(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "PAD Settings") + : wxDialog(parent, wxID_ANY, "Controller settings") , m_button_id(0) , m_key_pressed(false) , m_emu_paused(false) @@ -22,20 +22,20 @@ PADManager::PADManager(wxWindow* parent) wxBoxSizer* s_subpanel = new wxBoxSizer(wxVERTICAL); wxBoxSizer* s_subpanel2 = new wxBoxSizer(wxVERTICAL); - // Left Analog Stick - wxStaticBoxSizer* s_round_stick_l = new wxStaticBoxSizer(wxVERTICAL, this, _("Left Analog Stick")); + // Left analog stick + wxStaticBoxSizer* s_round_stick_l = new wxStaticBoxSizer(wxVERTICAL, this, _("Left analog stick")); wxBoxSizer* s_subpanel_lstick_1 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* s_subpanel_lstick_2 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* s_subpanel_lstick_3 = new wxBoxSizer(wxVERTICAL); - // D-Pad - wxStaticBoxSizer* s_round_pad_controls = new wxStaticBoxSizer(wxVERTICAL, this, _("D-Pad")); + // Directional pad + wxStaticBoxSizer* s_round_pad_controls = new wxStaticBoxSizer(wxVERTICAL, this, _("Directional pad")); wxBoxSizer* s_subpanel_pad_1 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* s_subpanel_pad_2 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* s_subpanel_pad_3 = new wxBoxSizer(wxVERTICAL); - // Left shifts - wxStaticBoxSizer* s_round_pad_shifts_l = new wxStaticBoxSizer(wxVERTICAL, this, _("Left Shifts")); + // L buttons + wxStaticBoxSizer* s_round_pad_shifts_l = new wxStaticBoxSizer(wxVERTICAL, this, _("L buttons")); wxStaticBoxSizer* s_round_pad_l1 = new wxStaticBoxSizer(wxVERTICAL, this, _("L1")); wxStaticBoxSizer* s_round_pad_l2 = new wxStaticBoxSizer(wxVERTICAL, this, _("L2")); wxStaticBoxSizer* s_round_pad_l3 = new wxStaticBoxSizer(wxVERTICAL, this, _("L3")); @@ -45,8 +45,8 @@ PADManager::PADManager(wxWindow* parent) wxStaticBoxSizer* s_round_pad_select = new wxStaticBoxSizer(wxVERTICAL, this, _("Select")); wxStaticBoxSizer* s_round_pad_start = new wxStaticBoxSizer(wxVERTICAL, this, _("Start")); - // Right shifts - wxStaticBoxSizer* s_round_pad_shifts_r = new wxStaticBoxSizer(wxVERTICAL, this, _("Right Shifts")); + // R buttons + wxStaticBoxSizer* s_round_pad_shifts_r = new wxStaticBoxSizer(wxVERTICAL, this, _("R buttons")); wxStaticBoxSizer* s_round_pad_r1 = new wxStaticBoxSizer(wxVERTICAL, this, _("R1")); wxStaticBoxSizer* s_round_pad_r2 = new wxStaticBoxSizer(wxVERTICAL, this, _("R2")); wxStaticBoxSizer* s_round_pad_r3 = new wxStaticBoxSizer(wxVERTICAL, this, _("R3")); @@ -61,8 +61,8 @@ PADManager::PADManager(wxWindow* parent) wxBoxSizer* s_subpanel_buttons_2 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* s_subpanel_buttons_3 = new wxBoxSizer(wxVERTICAL); - // Right Analog Stick - wxStaticBoxSizer* s_round_stick_r = new wxStaticBoxSizer(wxVERTICAL, this, _("Right Analog Stick")); + // Right analog stick + wxStaticBoxSizer* s_round_stick_r = new wxStaticBoxSizer(wxVERTICAL, this, _("Right analog stick")); wxBoxSizer* s_subpanel_rstick_1 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* s_subpanel_rstick_2 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* s_subpanel_rstick_3 = new wxBoxSizer(wxVERTICAL); @@ -123,13 +123,13 @@ PADManager::PADManager(wxWindow* parent) s_subpanel_lstick_2->Add(b_right_lstick); s_subpanel_lstick_3->Add(b_down_lstick); - // D-Pad + // Directional pad s_subpanel_pad_1->Add(b_up); s_subpanel_pad_2->Add(b_left); s_subpanel_pad_2->Add(b_right); s_subpanel_pad_3->Add(b_down); - // Left shifts + // L button s_round_pad_l1->Add(b_shift_l1); s_round_pad_l2->Add(b_shift_l2); s_round_pad_l3->Add(b_shift_l3); @@ -138,7 +138,7 @@ PADManager::PADManager(wxWindow* parent) s_round_pad_select->Add(b_select); s_round_pad_start->Add(b_start); - // Right shifts + // R button s_round_pad_r1->Add(b_shift_r1); s_round_pad_r2->Add(b_shift_r2); s_round_pad_r3->Add(b_shift_r3); diff --git a/rpcs3/Gui/RSXDebugger.cpp b/rpcs3/Gui/RSXDebugger.cpp index 5eefb3752d..0c36171996 100644 --- a/rpcs3/Gui/RSXDebugger.cpp +++ b/rpcs3/Gui/RSXDebugger.cpp @@ -27,7 +27,7 @@ enum GCMEnumTypes }; RSXDebugger::RSXDebugger(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "RSX Debugger", wxDefaultPosition, wxSize(700, 450)) + : wxDialog(parent, wxID_ANY, "RSX debugger", wxDefaultPosition, wxSize(700, 450)) , m_item_count(37) , m_addr(0x0) , m_cur_texture(0) @@ -40,7 +40,7 @@ RSXDebugger::RSXDebugger(wxWindow* parent) wxBoxSizer* s_tools = new wxBoxSizer(wxVERTICAL); // Controls - wxStaticBoxSizer* s_controls = new wxStaticBoxSizer(wxHORIZONTAL, this, "RSX Debugger Controls"); + wxStaticBoxSizer* s_controls = new wxStaticBoxSizer(wxHORIZONTAL, this, "RSX debugger controls"); // Controls: Address wxStaticBoxSizer* s_controls_addr = new wxStaticBoxSizer(wxHORIZONTAL, this, "Address:"); @@ -91,9 +91,9 @@ RSXDebugger::RSXDebugger(wxWindow* parent) wxPanel* p_texture = new wxPanel(nb_rsx, wxID_ANY); wxPanel* p_settings = new wxPanel(nb_rsx, wxID_ANY); - nb_rsx->AddPage(p_commands, wxT("RSX Commands")); - nb_rsx->AddPage(p_captured_frame, wxT("Captured Frame")); - nb_rsx->AddPage(p_captured_draw_calls, wxT("Captured Draw Calls")); + nb_rsx->AddPage(p_commands, wxT("RSX commands")); + nb_rsx->AddPage(p_captured_frame, wxT("Captured frame")); + nb_rsx->AddPage(p_captured_draw_calls, wxT("Captured draw calls")); nb_rsx->AddPage(p_flags, wxT("Flags")); nb_rsx->AddPage(p_lightning, wxT("Lightning")); @@ -179,12 +179,12 @@ RSXDebugger::RSXDebugger(wxWindow* parent) //Buffers wxBoxSizer* s_buffers1 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* s_buffers2 = new wxBoxSizer(wxVERTICAL); - wxStaticBoxSizer* s_buffers_colorA = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Color Buffer A"); - wxStaticBoxSizer* s_buffers_colorB = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Color Buffer B"); - wxStaticBoxSizer* s_buffers_colorC = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Color Buffer C"); - wxStaticBoxSizer* s_buffers_colorD = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Color Buffer D"); - wxStaticBoxSizer* s_buffers_depth = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Depth Buffer"); - wxStaticBoxSizer* s_buffers_stencil = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Stencil Buffer"); + wxStaticBoxSizer* s_buffers_colorA = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Color buffer A"); + wxStaticBoxSizer* s_buffers_colorB = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Color buffer B"); + wxStaticBoxSizer* s_buffers_colorC = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Color buffer C"); + wxStaticBoxSizer* s_buffers_colorD = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Color buffer D"); + wxStaticBoxSizer* s_buffers_depth = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Depth buffer"); + wxStaticBoxSizer* s_buffers_stencil = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Stencil buffer"); wxStaticBoxSizer* s_buffers_text = new wxStaticBoxSizer(wxHORIZONTAL, p_buffers, "Texture"); //Buffers and textures @@ -766,11 +766,11 @@ void RSXDebugger::GetSettings() render.m_color_mask_g, render.m_color_mask_b, render.m_color_mask_a)); - LIST_SETTINGS_ADD("Context DMA Color A", wxString::Format("0x%x", render.m_context_dma_color_a)); - LIST_SETTINGS_ADD("Context DMA Color B", wxString::Format("0x%x", render.m_context_dma_color_b)); - LIST_SETTINGS_ADD("Context DMA Color C", wxString::Format("0x%x", render.m_context_dma_color_c)); - LIST_SETTINGS_ADD("Context DMA Color D", wxString::Format("0x%x", render.m_context_dma_color_d)); - LIST_SETTINGS_ADD("Context DMA Zeta", wxString::Format("0x%x", render.m_context_dma_z)); + LIST_SETTINGS_ADD("Context DMA color A", wxString::Format("0x%x", render.m_context_dma_color_a)); + LIST_SETTINGS_ADD("Context DMA color B", wxString::Format("0x%x", render.m_context_dma_color_b)); + LIST_SETTINGS_ADD("Context DMA color C", wxString::Format("0x%x", render.m_context_dma_color_c)); + LIST_SETTINGS_ADD("Context DMA color D", wxString::Format("0x%x", render.m_context_dma_color_d)); + LIST_SETTINGS_ADD("Context DMA zeta", wxString::Format("0x%x", render.m_context_dma_z)); LIST_SETTINGS_ADD("Depth bounds", wxString::Format("Min:%f, Max:%f", render.m_depth_bounds_min, render.m_depth_bounds_max)); LIST_SETTINGS_ADD("Depth func", !(render.m_set_depth_func) ? "(none)" : wxString::Format("0x%x (%s)", render.m_depth_func, @@ -786,16 +786,16 @@ void RSXDebugger::GetSettings() LIST_SETTINGS_ADD("Stencil func", !(render.m_set_stencil_func) ? "(none)" : wxString::Format("0x%x (%s)", render.m_stencil_func, ParseGCMEnum(render.m_stencil_func, CELL_GCM_ENUM))); - LIST_SETTINGS_ADD("Surface Pitch A", wxString::Format("0x%x", render.m_surface_pitch_a)); - LIST_SETTINGS_ADD("Surface Pitch B", wxString::Format("0x%x", render.m_surface_pitch_b)); - LIST_SETTINGS_ADD("Surface Pitch C", wxString::Format("0x%x", render.m_surface_pitch_c)); - LIST_SETTINGS_ADD("Surface Pitch D", wxString::Format("0x%x", render.m_surface_pitch_d)); - LIST_SETTINGS_ADD("Surface Pitch Z", wxString::Format("0x%x", render.m_surface_pitch_z)); - LIST_SETTINGS_ADD("Surface Offset A", wxString::Format("0x%x", render.m_surface_offset_a)); - LIST_SETTINGS_ADD("Surface Offset B", wxString::Format("0x%x", render.m_surface_offset_b)); - LIST_SETTINGS_ADD("Surface Offset C", wxString::Format("0x%x", render.m_surface_offset_c)); - LIST_SETTINGS_ADD("Surface Offset D", wxString::Format("0x%x", render.m_surface_offset_d)); - LIST_SETTINGS_ADD("Surface Offset Z", wxString::Format("0x%x", render.m_surface_offset_z)); + LIST_SETTINGS_ADD("Surface pitch A", wxString::Format("0x%x", render.m_surface_pitch_a)); + LIST_SETTINGS_ADD("Surface pitch B", wxString::Format("0x%x", render.m_surface_pitch_b)); + LIST_SETTINGS_ADD("Surface pitch C", wxString::Format("0x%x", render.m_surface_pitch_c)); + LIST_SETTINGS_ADD("Surface pitch D", wxString::Format("0x%x", render.m_surface_pitch_d)); + LIST_SETTINGS_ADD("Surface pitch Z", wxString::Format("0x%x", render.m_surface_pitch_z)); + LIST_SETTINGS_ADD("Surface offset A", wxString::Format("0x%x", render.m_surface_offset_a)); + LIST_SETTINGS_ADD("Surface offset B", wxString::Format("0x%x", render.m_surface_offset_b)); + LIST_SETTINGS_ADD("Surface offset C", wxString::Format("0x%x", render.m_surface_offset_c)); + LIST_SETTINGS_ADD("Surface offset D", wxString::Format("0x%x", render.m_surface_offset_d)); + LIST_SETTINGS_ADD("Surface offset Z", wxString::Format("0x%x", render.m_surface_offset_z)); LIST_SETTINGS_ADD("Viewport", wxString::Format("X:%d, Y:%d, W:%d, H:%d", render.m_viewport_x, render.m_viewport_y, @@ -848,8 +848,8 @@ void RSXDebugger::SetPrograms(wxListEvent& event) wxDEFAULT_DIALOG_STYLE | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxRESIZE_BORDER); wxBoxSizer& s_panel = *new wxBoxSizer(wxHORIZONTAL); - wxStaticBoxSizer& s_vp_box = *new wxStaticBoxSizer(wxHORIZONTAL, &d_editor, "Vertex Program"); - wxStaticBoxSizer& s_fp_box = *new wxStaticBoxSizer(wxHORIZONTAL, &d_editor, "Fragment Program"); + wxStaticBoxSizer& s_vp_box = *new wxStaticBoxSizer(wxHORIZONTAL, &d_editor, "Vertex program"); + wxStaticBoxSizer& s_fp_box = *new wxStaticBoxSizer(wxHORIZONTAL, &d_editor, "Fragment program"); wxTextCtrl* t_vp_edit = new wxTextCtrl(&d_editor, wxID_ANY, program.vp_shader, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); wxTextCtrl* t_fp_edit = new wxTextCtrl(&d_editor, wxID_ANY, program.fp_shader, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); t_vp_edit->SetFont(wxFont(8, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); @@ -893,10 +893,10 @@ const char* RSXDebugger::ParseGCMEnum(u32 value, u32 type) case 0x0200: return "Never"; case 0x0201: return "Less"; case 0x0202: return "Equal"; - case 0x0203: return "Less or Equal"; + case 0x0203: return "Less or equal"; case 0x0204: return "Greater"; - case 0x0205: return "Not Equal"; - case 0x0206: return "Greater or Equal"; + case 0x0205: return "Not equal"; + case 0x0206: return "Greater or equal"; case 0x0207: return "Always"; case 0x0: return "Zero"; @@ -919,12 +919,12 @@ const char* RSXDebugger::ParseGCMEnum(u32 value, u32 type) case 0x8007: return "Min"; case 0x8008: return "Max"; case 0x800A: return "Substract"; - case 0x800B: return "Reverse Substract"; - case 0xF005: return "Reverse Substract Signed"; - case 0xF006: return "Add Signed"; - case 0xF007: return "Reverse Add Signed"; + case 0x800B: return "Reverse substract"; + case 0xF005: return "Reverse substract signed"; + case 0xF006: return "Add signed"; + case 0xF007: return "Reverse add signed"; - default: return "Wrong Value!"; + default: return "Wrong value!"; } } case CELL_GCM_PRIMITIVE_ENUM: @@ -942,7 +942,7 @@ const char* RSXDebugger::ParseGCMEnum(u32 value, u32 type) case 9: return "QUAD_STRIP"; case 10: return "POLYGON"; - default: return "Wrong Value!"; + default: return "Wrong value!"; } } default: return "Unknown!"; @@ -1004,7 +1004,7 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA break; case_16(NV4097_SET_TEXTURE_OFFSET, 0x20): - DISASM("Texture Offset[%d]: %08x", index, (u32)args[0]); + DISASM("Texture offset[%d]: %08x", index, (u32)args[0]); switch ((args[1] & 0x3) - 1) { case CELL_GCM_LOCATION_LOCAL: DISASM("(Local memory);"); break; diff --git a/rpcs3/Gui/SettingsDialog.cpp b/rpcs3/Gui/SettingsDialog.cpp index 4827f640d4..d67b4bead4 100644 --- a/rpcs3/Gui/SettingsDialog.cpp +++ b/rpcs3/Gui/SettingsDialog.cpp @@ -135,24 +135,24 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) wxStaticBoxSizer* s_round_llvm_threshold = new wxStaticBoxSizer(wxHORIZONTAL, p_core, _("Compilation threshold")); // Graphics - wxStaticBoxSizer* s_round_gs_render = new wxStaticBoxSizer(wxVERTICAL, p_graphics, _("Render")); - wxStaticBoxSizer* s_round_gs_d3d_adaptater = new wxStaticBoxSizer(wxVERTICAL, p_graphics, _("D3D Adaptater")); + wxStaticBoxSizer* s_round_gs_render = new wxStaticBoxSizer(wxVERTICAL, p_graphics, _("Rendering API")); + wxStaticBoxSizer* s_round_gs_d3d_adaptater = new wxStaticBoxSizer(wxVERTICAL, p_graphics, _("DirectX 12 primary adapter")); wxStaticBoxSizer* s_round_gs_res = new wxStaticBoxSizer(wxVERTICAL, p_graphics, _("Resolution")); wxStaticBoxSizer* s_round_gs_aspect = new wxStaticBoxSizer(wxVERTICAL, p_graphics, _("Aspect ratio")); wxStaticBoxSizer* s_round_gs_frame_limit = new wxStaticBoxSizer(wxVERTICAL, p_graphics, _("Frame limit")); // Input / Output - wxStaticBoxSizer* s_round_io_pad_handler = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Pad Handler")); - wxStaticBoxSizer* s_round_io_keyboard_handler = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Keyboard Handler")); - wxStaticBoxSizer* s_round_io_mouse_handler = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Mouse Handler")); + wxStaticBoxSizer* s_round_io_pad_handler = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Controller handler")); + wxStaticBoxSizer* s_round_io_keyboard_handler = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Keyboard handler")); + wxStaticBoxSizer* s_round_io_mouse_handler = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Mouse handler")); wxStaticBoxSizer* s_round_io_camera = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Camera")); wxStaticBoxSizer* s_round_io_camera_type = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Camera type")); // Audio - wxStaticBoxSizer* s_round_audio_out = new wxStaticBoxSizer(wxVERTICAL, p_audio, _("Audio Out")); + wxStaticBoxSizer* s_round_audio_out = new wxStaticBoxSizer(wxVERTICAL, p_audio, _("Audio out")); // Miscellaneous - wxStaticBoxSizer* s_round_hle_log_lvl = new wxStaticBoxSizer(wxVERTICAL, p_misc, _("Log Level")); + wxStaticBoxSizer* s_round_hle_log_lvl = new wxStaticBoxSizer(wxVERTICAL, p_misc, _("Log level")); // Networking wxStaticBoxSizer* s_round_net_status = new wxStaticBoxSizer(wxVERTICAL, p_networking, _("Connection status")); @@ -184,18 +184,18 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) wxCheckBox* chbox_core_hook_stfunc = new wxCheckBox(p_core, wxID_ANY, "Hook static functions"); wxCheckBox* chbox_core_load_liblv2 = new wxCheckBox(p_core, wxID_ANY, "Load liblv2.sprx"); wxCheckBox* chbox_gs_log_prog = new wxCheckBox(p_graphics, wxID_ANY, "Log shader programs"); - wxCheckBox* chbox_gs_dump_depth = new wxCheckBox(p_graphics, wxID_ANY, "Write Depth Buffer"); - wxCheckBox* chbox_gs_dump_color = new wxCheckBox(p_graphics, wxID_ANY, "Write Color Buffers"); - wxCheckBox* chbox_gs_read_color = new wxCheckBox(p_graphics, wxID_ANY, "Read Color Buffers"); - wxCheckBox* chbox_gs_read_depth = new wxCheckBox(p_graphics, wxID_ANY, "Read Depth Buffer"); + wxCheckBox* chbox_gs_dump_depth = new wxCheckBox(p_graphics, wxID_ANY, "Write depth buffer"); + wxCheckBox* chbox_gs_dump_color = new wxCheckBox(p_graphics, wxID_ANY, "Write color buffers"); + wxCheckBox* chbox_gs_read_color = new wxCheckBox(p_graphics, wxID_ANY, "Read color buffers"); + wxCheckBox* chbox_gs_read_depth = new wxCheckBox(p_graphics, wxID_ANY, "Read depth buffer"); wxCheckBox* chbox_gs_vsync = new wxCheckBox(p_graphics, wxID_ANY, "VSync"); - wxCheckBox* chbox_gs_debug_output = new wxCheckBox(p_graphics, wxID_ANY, "Debug Output"); - wxCheckBox* chbox_gs_3dmonitor = new wxCheckBox(p_graphics, wxID_ANY, "3D Monitor"); + wxCheckBox* chbox_gs_debug_output = new wxCheckBox(p_graphics, wxID_ANY, "Debug output"); + wxCheckBox* chbox_gs_3dmonitor = new wxCheckBox(p_graphics, wxID_ANY, "3D monitor"); wxCheckBox* chbox_gs_overlay = new wxCheckBox(p_graphics, wxID_ANY, "Debug overlay"); wxCheckBox* chbox_audio_dump = new wxCheckBox(p_audio, wxID_ANY, "Dump to file"); - wxCheckBox* chbox_audio_conv = new wxCheckBox(p_audio, wxID_ANY, "Convert to 16 bit"); + wxCheckBox* chbox_audio_conv = new wxCheckBox(p_audio, wxID_ANY, "Convert to 16-bit"); wxCheckBox* chbox_hle_logging = new wxCheckBox(p_misc, wxID_ANY, "Log everything"); - wxCheckBox* chbox_rsx_logging = new wxCheckBox(p_misc, wxID_ANY, "RSX Logging"); + wxCheckBox* chbox_rsx_logging = new wxCheckBox(p_misc, wxID_ANY, "RSX logging"); wxCheckBox* chbox_hle_savetty = new wxCheckBox(p_misc, wxID_ANY, "Save TTY output to file"); wxCheckBox* chbox_hle_exitonstop = new wxCheckBox(p_misc, wxID_ANY, "Exit RPCS3 when process finishes"); wxCheckBox* chbox_hle_always_start = new wxCheckBox(p_misc, wxID_ANY, "Always start after boot"); @@ -206,8 +206,8 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) wxTextCtrl* txt_llvm_threshold = new wxTextCtrl(p_core, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(55, 20)); //Auto Pause - wxCheckBox* chbox_dbg_ap_systemcall = new wxCheckBox(p_misc, wxID_ANY, "Auto Pause at System Call"); - wxCheckBox* chbox_dbg_ap_functioncall = new wxCheckBox(p_misc, wxID_ANY, "Auto Pause at Function Call"); + wxCheckBox* chbox_dbg_ap_systemcall = new wxCheckBox(p_misc, wxID_ANY, "Automatically pause at system call"); + wxCheckBox* chbox_dbg_ap_functioncall = new wxCheckBox(p_misc, wxID_ANY, "Automatically pause at function call"); //Custom EmulationDir wxCheckBox* chbox_emulationdir_enable = new wxCheckBox(p_system, wxID_ANY, "Use path below as EmulationDir. (Restart required)"); @@ -218,7 +218,7 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) ppu_decoder_modes.Add("Interpreter"); ppu_decoder_modes.Add("Interpreter 2"); ppu_decoder_modes.Add("Recompiler (LLVM)"); - rbox_ppu_decoder = new wxRadioBox(p_core, wxID_ANY, "PPU Decoder", wxDefaultPosition, wxSize(215, -1), ppu_decoder_modes, 1); + rbox_ppu_decoder = new wxRadioBox(p_core, wxID_ANY, "PPU decoder", wxDefaultPosition, wxSize(215, -1), ppu_decoder_modes, 1); #if !defined(LLVM_AVAILABLE) rbox_ppu_decoder->Enable(2, false); @@ -228,7 +228,7 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) spu_decoder_modes.Add("Interpreter (precise)"); spu_decoder_modes.Add("Interpreter (fast)"); spu_decoder_modes.Add("Recompiler (ASMJIT)"); - rbox_spu_decoder = new wxRadioBox(p_core, wxID_ANY, "SPU Decoder", wxDefaultPosition, wxSize(215, -1), spu_decoder_modes, 1); + rbox_spu_decoder = new wxRadioBox(p_core, wxID_ANY, "SPU decoder", wxDefaultPosition, wxSize(215, -1), spu_decoder_modes, 1); cbox_gs_render->Append("Null"); cbox_gs_render->Append("OpenGL"); @@ -263,7 +263,7 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) cbox_gs_aspect->Append("4:3"); cbox_gs_aspect->Append("16:9"); - for (auto item : { "Off", "50", "59.94", "30", "60", "Auto" }) + for (auto item : { "Off", "30", "50", "59.94", "60", "Auto" }) cbox_gs_frame_limit->Append(item); cbox_pad_handler->Append("Null"); diff --git a/rpcs3/Gui/VFSManager.cpp b/rpcs3/Gui/VFSManager.cpp index ba6f95319d..687229cb87 100644 --- a/rpcs3/Gui/VFSManager.cpp +++ b/rpcs3/Gui/VFSManager.cpp @@ -116,7 +116,7 @@ enum }; VFSManagerDialog::VFSManagerDialog(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "Virtual File System Manager") + : wxDialog(parent, wxID_ANY, "Virtual file system manager") { m_list = new wxListView(this); @@ -134,7 +134,7 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent) m_list->InsertColumn(0, "Path"); m_list->InsertColumn(1, "Device path"); - m_list->InsertColumn(2, "Path to Device"); + m_list->InsertColumn(2, "Path to device"); m_list->InsertColumn(3, "Device"); m_list->Bind(wxEVT_LIST_ITEM_ACTIVATED, &VFSManagerDialog::OnEntryConfig, this); diff --git a/rpcs3/Gui/VHDDManager.cpp b/rpcs3/Gui/VHDDManager.cpp index 81ff563985..cf8522a84b 100644 --- a/rpcs3/Gui/VHDDManager.cpp +++ b/rpcs3/Gui/VHDDManager.cpp @@ -51,7 +51,7 @@ enum id_add_hdd }; -VHDDExplorer::VHDDExplorer(wxWindow* parent, const std::string& hdd_path) : wxDialog(parent, wxID_ANY, "Virtual HDD Explorer", wxDefaultPosition) +VHDDExplorer::VHDDExplorer(wxWindow* parent, const std::string& hdd_path) : wxDialog(parent, wxID_ANY, "Virtual hard drive explorer", wxDefaultPosition) { m_list = new wxListView(this); m_drop_target = new VHDDListDropTarget(m_list); @@ -250,18 +250,18 @@ void VHDDExplorer::OnRemove(wxCommandEvent& event) void VHDDExplorer::OnCreateDir(wxCommandEvent& event) { int i = 1; - while(m_hdd->HasEntry(fmt::format("New Dir (%d)", i))) i++; + while(m_hdd->HasEntry(fmt::format("New dir (%d)", i))) i++; - m_hdd->Create(vfsHDD_Entry_Dir, fmt::format("New Dir (%d)", i)); + m_hdd->Create(vfsHDD_Entry_Dir, fmt::format("New dir (%d)", i)); UpdateList(); } void VHDDExplorer::OnCreateFile(wxCommandEvent& event) { int i = 1; - while (m_hdd->HasEntry(fmt::format("New File (%d)", i))) i++; + while (m_hdd->HasEntry(fmt::format("New file (%d)", i))) i++; - m_hdd->Create(vfsHDD_Entry_File, fmt::format("New File (%d)", i)); + m_hdd->Create(vfsHDD_Entry_File, fmt::format("New file (%d)", i)); UpdateList(); } @@ -377,7 +377,7 @@ void VHDDSetInfoDialog::GetResult(u64& size, u64& block_size) } VHDDManagerDialog::VHDDManagerDialog(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "Virtual HDD Manager") + : wxDialog(parent, wxID_ANY, "Virtual hard drive Manager") { m_list = new wxListView(this); @@ -439,7 +439,7 @@ void VHDDManagerDialog::DClick(wxListEvent& event) void VHDDManagerDialog::AddHDD(wxCommandEvent& event) { - wxFileDialog ctrl(this, "Select HDDs", wxEmptyString, wxEmptyString, "Virtual HDD (*.hdd) | *.hdd", + wxFileDialog ctrl(this, "Select hard drives", wxEmptyString, wxEmptyString, "Virtual hard drive (*.hdd) | *.hdd", wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE); if(ctrl.ShowModal() == wxID_CANCEL) @@ -499,7 +499,7 @@ void VHDDManagerDialog::OnRemove(wxCommandEvent& event) void VHDDManagerDialog::OnCreateHDD(wxCommandEvent& event) { - wxFileDialog ctrl(this, "Select HDD path", wxEmptyString, "new_hdd.hdd", "Virtual HDD (*.hdd) | *.hdd", + wxFileDialog ctrl(this, "Select hard drive path", wxEmptyString, "new_hdd.hdd", "Virtual hard drive (*.hdd) | *.hdd", wxFD_SAVE | wxFD_OVERWRITE_PROMPT); if(ctrl.ShowModal() == wxID_CANCEL) diff --git a/rpcs3/config.h b/rpcs3/config.h index 2ed632a31a..f20b0df7da 100644 --- a/rpcs3/config.h +++ b/rpcs3/config.h @@ -62,9 +62,9 @@ enum class rsx_aspect_ratio enum class rsx_frame_limit { Off, + _30, _50, _59_94, - _30, _60, Auto }; @@ -173,6 +173,9 @@ namespace convert { if (value == "Off") return rsx_frame_limit::Off; + + if (value == "30") + return rsx_frame_limit::_30; if (value == "50") return rsx_frame_limit::_50; @@ -180,9 +183,6 @@ namespace convert if (value == "59.94") return rsx_frame_limit::_59_94; - if (value == "30") - return rsx_frame_limit::_30; - if (value == "60") return rsx_frame_limit::_60; @@ -833,8 +833,8 @@ namespace rpcs3 } llvm{ this }; - entry ppu_decoder { this, "PPU Decoder", ppu_decoder_type::interpreter }; - entry spu_decoder { this, "SPU Decoder", spu_decoder_type::interpreter_precise }; + entry ppu_decoder { this, "PPU decoder", ppu_decoder_type::interpreter }; + entry spu_decoder { this, "SPU decoder", spu_decoder_type::interpreter_precise }; entry hook_st_func { this, "Hook static functions", false }; entry load_liblv2 { this, "Load liblv2.sprx", false }; @@ -846,30 +846,30 @@ namespace rpcs3 { opengl_group(group *grp) : group{ grp, "opengl" } {} - entry write_color_buffers { this, "Write Color Buffers", true }; - entry write_depth_buffer { this, "Write Depth Buffer", true }; - entry read_color_buffers { this, "Read Color Buffers", true }; - entry read_depth_buffer { this, "Read Depth Buffer", true }; + entry write_color_buffers { this, "Write color buffers", true }; + entry write_depth_buffer { this, "Write depth buffer", true }; + entry read_color_buffers { this, "Read color buffers", true }; + entry read_depth_buffer { this, "Read depth buffer", true }; } opengl{ this }; struct d3d12_group : protected group { d3d12_group(group *grp) : group{ grp, "d3d12" } {} - entry adaptater { this, "D3D Adaptater", 1 }; - entry debug_output { this, "Debug Output", false }; - entry overlay { this, "Debug overlay", false }; + entry adaptater { this, "DirectX 12 primary adapter", 0 }; + entry debug_output { this, "Debug output", false }; + entry overlay { this, "Debug overlay", false }; } d3d12{ this }; rsx_group(config_context_t *cfg) : group{ cfg, "rsx" } {} - entry renderer { this, "Renderer", rsx_renderer_type::OpenGL }; + entry renderer { this, "Rendering API", rsx_renderer_type::OpenGL }; entry resolution { this, "Resolution", rsx_resolution::_720x480 }; entry aspect_ratio{ this, "Aspect ratio", rsx_aspect_ratio::_16x9 }; entry frame_limit { this, "Frame limit", rsx_frame_limit::Off }; entry log_programs { this, "Log shader programs", false }; entry vsync { this, "VSync", false }; - entry _3dtv { this, "3D Monitor", false }; + entry _3dtv { this, "3D monitor", false }; } rsx{ this }; @@ -877,33 +877,33 @@ namespace rpcs3 { audio_group(config_context_t *cfg) : group{ cfg, "audio" } {} - entry out{ this, "Audio Out", audio_output_type::OpenAL }; + entry out{ this, "Audio out", audio_output_type::OpenAL }; entry dump_to_file { this, "Dump to file", false }; - entry convert_to_u16 { this, "Convert to 16 bit", false }; + entry convert_to_u16 { this, "Convert to 16-bit", false }; } audio{ this }; struct io_group : protected group { io_group(config_context_t *cfg) : group{ cfg, "io" } {} - entry camera { this, "Camera", io_camera_state::connected }; - entry camera_type { this, "Camera type", io_camera_type::play_station_eye }; - entry pad_handler_mode { this, "Pad Handler", io_handler_mode::windows }; - entry keyboard_handler_mode{ this, "Keyboard Handler", io_handler_mode::null }; - entry mouse_handler_mode { this, "Mouse Handler", io_handler_mode::null }; + entry camera { this, "Camera", io_camera_state::connected }; + entry camera_type { this, "Camera type", io_camera_type::play_station_eye }; + entry pad_handler_mode { this, "Controller handler", io_handler_mode::windows }; + entry keyboard_handler_mode{ this, "Keyboard handler", io_handler_mode::null }; + entry mouse_handler_mode { this, "Mouse handler", io_handler_mode::null }; struct pad_group : protected group { pad_group(group *grp) : group{ grp, "pad" } {} - entry left_stick_left { this, "Left Analog Stick Left", 314 }; - entry left_stick_down { this, "Left Analog Stick Down", 317 }; - entry left_stick_right { this, "Left Analog Stick Right", 316 }; - entry left_stick_up { this, "Left Analog Stick Up", 315 }; - entry right_stick_left { this, "Right Analog Stick Left", 313 }; - entry right_stick_down { this, "Right Analog Stick Down", 367 }; - entry right_stick_right{ this, "Right Analog Stick Right", 312 }; - entry right_stick_up { this, "Right Analog Stick Up", 366 }; + entry left_stick_left { this, "Left analog stick Left", 314 }; + entry left_stick_down { this, "Left analog stick Down", 317 }; + entry left_stick_right { this, "Left analog stick Right", 316 }; + entry left_stick_up { this, "Left analog stick Up", 315 }; + entry right_stick_left { this, "Right analog stick Left", 313 }; + entry right_stick_down { this, "Right analog stick Down", 367 }; + entry right_stick_right{ this, "Right analog stick Right", 312 }; + entry right_stick_up { this, "Right analog stick Up", 366 }; entry start { this, "Start", 13 }; entry select { this, "Select", 32 }; entry square { this, "Square", static_cast('J') }; @@ -932,9 +932,9 @@ namespace rpcs3 { log_group(group *grp) : group{ grp, "log" } {} - entry level { this, "Log Level", misc_log_level::errors }; + entry level { this, "Log level", misc_log_level::errors }; entry hle_logging { this, "Log everything", false }; - entry rsx_logging { this, "RSX Logging", false }; + entry rsx_logging { this, "RSX logging", false }; entry save_tty { this, "Save TTY output to file", false }; } log{ this }; @@ -950,8 +950,8 @@ namespace rpcs3 { debug_group(group *grp) : group{ grp, "debug" } {} - entry auto_pause_syscall { this, "Auto Pause at System Call", false }; - entry auto_pause_func_call { this, "Auto Pause at Function Call", false }; + entry auto_pause_syscall { this, "Automatically pause at system call", false }; + entry auto_pause_func_call { this, "Automatically pause at function call", false }; } debug{ this }; entry exit_on_stop { this, "Exit RPCS3 when process finishes", false };