From d930ecbf4047815a7fb782513738110d51477125 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 | 12 +++--- rpcs3/Emu/System.cpp | 2 +- rpcs3/Emu/System.h | 14 +++---- rpcs3/keyboard_pad_handler.h | 2 +- rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp | 16 ++++---- rpcs3/rpcs3qt/cg_disasm_window.cpp | 2 +- rpcs3/rpcs3qt/debugger_frame.cpp | 4 +- rpcs3/rpcs3qt/emu_settings.h | 10 ++--- rpcs3/rpcs3qt/game_list_frame.cpp | 30 +++++++-------- rpcs3/rpcs3qt/gs_frame.cpp | 2 +- rpcs3/rpcs3qt/kernel_explorer.cpp | 40 ++++++++++---------- rpcs3/rpcs3qt/main_window.cpp | 10 ++--- rpcs3/rpcs3qt/memory_string_searcher.cpp | 2 +- rpcs3/rpcs3qt/memory_viewer_panel.cpp | 8 ++-- rpcs3/rpcs3qt/rsx_debugger.cpp | 28 +++++++------- rpcs3/rpcs3qt/save_data_list_dialog.cpp | 10 ++--- 16 files changed, 96 insertions(+), 96 deletions(-) diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index c65a8056d8..4db86fa8a6 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -21,10 +21,10 @@ void fmt_class_string::format(std::string& out, u64 arg) switch (value) { case frame_limit_type::none: return "Off"; - case frame_limit_type::_59_94: return "59.94"; - case frame_limit_type::_50: return "50"; - case frame_limit_type::_60: return "60"; case frame_limit_type::_30: return "30"; + case frame_limit_type::_50: return "50"; + case frame_limit_type::_59_94: return "59.94"; + case frame_limit_type::_60: return "60"; case frame_limit_type::_auto: return "Auto"; } @@ -918,10 +918,10 @@ namespace rsx switch (g_cfg.video.frame_limit) { case frame_limit_type::none: limit = 0.; break; - case frame_limit_type::_59_94: limit = 59.94; break; - case frame_limit_type::_50: limit = 50.; break; - case frame_limit_type::_60: limit = 60.; break; case frame_limit_type::_30: limit = 30.; break; + case frame_limit_type::_50: limit = 50.; break; + case frame_limit_type::_59_94: limit = 59.94; break; + case frame_limit_type::_60: limit = 60.; break; case frame_limit_type::_auto: limit = rsx->fps_limit; break; // TODO } if (limit) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index c1f19c38b4..009c357064 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -99,7 +99,7 @@ void fmt_class_string::format(std::string& out, u64 arg) case video_renderer::opengl: return "OpenGL"; case video_renderer::vulkan: return "Vulkan"; #ifdef _MSC_VER - case video_renderer::dx12: return "D3D12"; + case video_renderer::dx12: return "DirectX 12"; #endif } diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index 3a7ba3c2ac..c70d13c73c 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -134,10 +134,10 @@ enum class video_aspect enum class frame_limit_type { none, - _59_94, - _50, - _60, _30, + _50, + _59_94, + _60, _auto, }; @@ -280,7 +280,7 @@ struct cfg_root : cfg::node cfg::_int<0, 16> spu_delay_penalty{this, "SPU delay penalty", 3}; //Number of milliseconds to block a thread if a virtual 'core' isn't free cfg::_bool spu_loop_detection{this, "SPU loop detection", true}; //Try to detect wait loops and trigger thread yield - cfg::_enum lib_loading{this, "Lib Loader", lib_loading_type::liblv2only}; + cfg::_enum lib_loading{this, "Lib loader", lib_loading_type::liblv2only}; cfg::_bool hook_functions{this, "Hook static functions"}; cfg::set_entry load_libraries{this, "Load libraries"}; @@ -337,7 +337,7 @@ struct cfg_root : cfg::node struct node_d3d12 : cfg::node { - node_d3d12(cfg::node* _this) : cfg::node(_this, "D3D12") {} + node_d3d12(cfg::node* _this) : cfg::node(_this, "DirectX 12") {} cfg::string adapter{this, "Adapter"}; @@ -360,7 +360,7 @@ struct cfg_root : cfg::node cfg::_enum renderer{this, "Renderer", static_cast(1)}; cfg::_bool dump_to_file{this, "Dump to file"}; - cfg::_bool convert_to_u16{this, "Convert to 16 bit"}; + cfg::_bool convert_to_u16{this, "Convert to 16-bit"}; cfg::_bool downmix_to_2ch{this, "Downmix to Stereo", true}; } audio{this}; @@ -371,7 +371,7 @@ struct cfg_root : cfg::node cfg::_enum keyboard{this, "Keyboard", keyboard_handler::null}; cfg::_enum mouse{this, "Mouse", mouse_handler::basic}; - cfg::_enum pad{this, "Pad", pad_handler::keyboard}; + cfg::_enum pad{this, "Controller", pad_handler::keyboard}; cfg::_enum camera{this, "Camera", camera_handler::null}; cfg::_enum camera_type{this, "Camera type", fake_camera_type::unknown}; diff --git a/rpcs3/keyboard_pad_handler.h b/rpcs3/keyboard_pad_handler.h index 4bc69e3965..67d8d6b926 100644 --- a/rpcs3/keyboard_pad_handler.h +++ b/rpcs3/keyboard_pad_handler.h @@ -10,7 +10,7 @@ struct keyboard_pad_config final : cfg::node { - const std::string cfg_name = fs::get_config_dir() + "/config_kbpad_qt.yml"; + const std::string cfg_name = fs::get_config_dir() + "/config_kbpad.yml"; cfg::int32 left_stick_left{ this, "Left Analog Stick Left", Qt::Key_A }; cfg::int32 left_stick_down{ this, "Left Analog Stick Down", Qt::Key_S }; diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp index d2eb3b79cc..0723c0281e 100644 --- a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp @@ -1,11 +1,11 @@ - + #include "auto_pause_settings_dialog.h" constexpr auto qstr = QString::fromStdString; auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialog(parent) { - QLabel *description = new QLabel(tr("To use auto pause: enter the ID(s) of a function or a system call.\nRestart of the game is required to apply. You can enable/disable this in the settings."), this); + QLabel *description = new QLabel(tr("To use automatic 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."), this); pauseList = new QTableWidget(this); pauseList->setColumnCount(2); @@ -36,7 +36,7 @@ auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialo setLayout(mainLayout); setMinimumSize(QSize(400, 360)); - setWindowTitle(tr("Auto Pause Manager")); + setWindowTitle(tr("Automatic pause settings")); //Events connect(pauseList, &QTableWidget::customContextMenuRequested, this, &auto_pause_settings_dialog::ShowContextMenu); @@ -45,7 +45,7 @@ auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialo connect(saveButton, &QAbstractButton::clicked, [=] { SaveEntries(); - LOG_SUCCESS(HLE, "Auto Pause: File pause.bin was updated."); + LOG_SUCCESS(HLE, "Automatic pause: file pause.bin was updated."); }); connect(cancelButton, &QAbstractButton::clicked, this, &QWidget::close); @@ -123,11 +123,11 @@ void auto_pause_settings_dialog::UpdateList(void) if (m_entries[i] < 1024) { - typeItem->setData(Qt::DisplayRole, tr("System Call")); + typeItem->setData(Qt::DisplayRole, tr("System call")); } else { - typeItem->setData(Qt::DisplayRole, tr("Function Call")); + typeItem->setData(Qt::DisplayRole, tr("Function call")); } pauseList->setItem(i, 0, callItem); @@ -205,7 +205,7 @@ AutoPauseConfigDialog::AutoPauseConfigDialog(QWidget* parent, auto_pause_setting button_ok->setFixedWidth(50); button_cancel->setFixedWidth(50); - QLabel* description = new QLabel(tr("Specify ID of System Call or Function Call below. You need to use a Hexadecimal ID."), this); + QLabel* description = new QLabel(tr("Specify ID of system call or function call below. You need to use a hexadecimal ID."), this); description->setWordWrap(true); m_current_converted = new QLabel(tr("Currently it gets an id of \"Unset\"."), this); @@ -217,7 +217,7 @@ AutoPauseConfigDialog::AutoPauseConfigDialog(QWidget* parent, auto_pause_setting m_id->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont)); m_id->setMaxLength(8); m_id->setFixedWidth(65); - setWindowTitle("Auto Pause Setting: " + m_id->text()); + setWindowTitle("Automatic pause setting: " + m_id->text()); connect(button_cancel, &QAbstractButton::clicked, this, &AutoPauseConfigDialog::OnCancel); connect(button_ok, &QAbstractButton::clicked, this, &AutoPauseConfigDialog::OnOk); diff --git a/rpcs3/rpcs3qt/cg_disasm_window.cpp b/rpcs3/rpcs3qt/cg_disasm_window.cpp index 7d17489c71..63f488f45d 100644 --- a/rpcs3/rpcs3qt/cg_disasm_window.cpp +++ b/rpcs3/rpcs3qt/cg_disasm_window.cpp @@ -21,7 +21,7 @@ inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); cg_disasm_window::cg_disasm_window(std::shared_ptr xSettings): xgui_settings(xSettings) { - setWindowTitle(tr("Cg Disasm")); + setWindowTitle(tr("Cg disassembler")); setAttribute(Qt::WA_DeleteOnClose); setAcceptDrops(true); setMinimumSize(QSize(200, 150)); // seems fine on win 10 diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index 92da29f6e0..e80a79cf22 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -33,8 +33,8 @@ debugger_frame::debugger_frame(std::shared_ptr settings, QWidget * m_choice_units->completer()->setMaxVisibleItems(30); m_choice_units->completer()->setFilterMode(Qt::MatchContains); - m_go_to_addr = new QPushButton(tr("Go To Address"), this); - m_go_to_pc = new QPushButton(tr("Go To PC"), this); + m_go_to_addr = new QPushButton(tr("Go to address"), this); + m_go_to_pc = new QPushButton(tr("Go to PC"), this); m_btn_capture = new QPushButton(tr("Capture"), this); m_btn_step = new QPushButton(tr("Step"), this); m_btn_run = new QPushButton(Run, this); diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3qt/emu_settings.h index 0fb93507cb..1f610e804d 100644 --- a/rpcs3/rpcs3qt/emu_settings.h +++ b/rpcs3/rpcs3qt/emu_settings.h @@ -122,7 +122,7 @@ public: QStringList vulkanAdapters; QString name_Null = tr("Null"); QString name_Vulkan = tr("Vulkan"); - QString name_D3D12 = tr("D3D12[DO NOT USE]"); + QString name_D3D12 = tr("DirectX 12"); QString name_OpenGL = tr("OpenGL"); Render_Info D3D12; Render_Info Vulkan; @@ -182,7 +182,7 @@ private: // Core Tab { PPUDecoder, { "Core", "PPU Decoder"}}, { SPUDecoder, { "Core", "SPU Decoder"}}, - { LibLoadOptions, { "Core", "Lib Loader"}}, + { LibLoadOptions, { "Core", "Lib loader"}}, { HookStaticFuncs, { "Core", "Hook static functions"}}, { BindSPUThreads, { "Core", "Bind SPU threads to secondary cores"}}, { LowerSPUThreadPrio, { "Core", "Lower SPU thread priority"}}, @@ -215,17 +215,17 @@ private: { AnisotropicFilterOverride,{ "Video", "Anisotropic Filter Override" }}, { ResolutionScale, { "Video", "Resolution Scale" }}, { MinimumScalableDimension, { "Video", "Minimum Scalable Dimension" }}, - { D3D12Adapter, { "Video", "D3D12", "Adapter"}}, + { D3D12Adapter, { "Video", "DirectX 12", "Adapter"}}, { VulkanAdapter, { "Video", "Vulkan", "Adapter"}}, // Audio { AudioRenderer, { "Audio", "Renderer"}}, { DumpToFile, { "Audio", "Dump to file"}}, - { ConvertTo16Bit, { "Audio", "Convert to 16 bit"}}, + { ConvertTo16Bit, { "Audio", "Convert to 16-bit"}}, { DownmixStereo, { "Audio", "Downmix to Stereo"}}, // Input / Output - { PadHandler, { "Input/Output", "Pad"}}, + { PadHandler, { "Input/Output", "Controller"}}, { KeyboardHandler, { "Input/Output", "Keyboard"}}, { MouseHandler, { "Input/Output", "Mouse"}}, { Camera, { "Input/Output", "Camera"}}, diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 3db80303ff..da15da6703 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -29,7 +29,7 @@ inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); inline QSize sizeFromSlider(const int& pos) { return GUI::gl_icon_size_min + (GUI::gl_icon_size_max - GUI::gl_icon_size_min) * (pos / (float)GUI::gl_max_slider_pos); } game_list_frame::game_list_frame(std::shared_ptr guiSettings, std::shared_ptr emuSettings, QWidget *parent) - : QDockWidget(tr("Game List"), parent), xgui_settings(guiSettings), xemu_settings(emuSettings) + : QDockWidget(tr("Game list"), parent), xgui_settings(guiSettings), xemu_settings(emuSettings) { m_isListLayout = xgui_settings->GetValue(GUI::gl_listMode).toBool(); m_icon_size_index = xgui_settings->GetValue(GUI::gl_iconSize).toInt(); @@ -90,10 +90,10 @@ game_list_frame::game_list_frame(std::shared_ptr guiSettings, std: m_categoryActs->setEnabled(m_isListLayout); m_modeActList = { new QAction(""), QIcon(":/Icons/list_blue.png"), QIcon(":/Icons/list_gray.png") }; - m_modeActList.action->setToolTip(tr("Enable List Mode")); + m_modeActList.action->setToolTip(tr("Enable list mode")); m_modeActGrid = { new QAction(""), QIcon(":/Icons/grid_blue.png"), QIcon(":/Icons/grid_gray.png") }; - m_modeActGrid.action->setToolTip(tr("Enable Grid Mode")); + m_modeActGrid.action->setToolTip(tr("Enable grid mode")); m_modeActs = new QActionGroup(m_Tool_Bar); m_modeActs->addAction(m_modeActList.action); @@ -184,13 +184,13 @@ game_list_frame::game_list_frame(std::shared_ptr guiSettings, std: m_Game_Dock->setCentralWidget(m_Central_Widget); // Actions regarding showing/hiding columns - QAction* showIconColAct = new QAction(tr("Show Icons"), this); - QAction* showNameColAct = new QAction(tr("Show Names"), this); - QAction* showSerialColAct = new QAction(tr("Show Serials"), this); + QAction* showIconColAct = new QAction(tr("Show icons"), this); + QAction* showNameColAct = new QAction(tr("Show names"), this); + QAction* showSerialColAct = new QAction(tr("Show serials"), this); QAction* showFWColAct = new QAction(tr("Show Firmwares"), this); - QAction* showAppVersionColAct = new QAction(tr("Show Versions"), this); - QAction* showCategoryColAct = new QAction(tr("Show Categories"), this); - QAction* showPathColAct = new QAction(tr("Show Paths"), this); + QAction* showAppVersionColAct = new QAction(tr("Show versions"), this); + QAction* showCategoryColAct = new QAction(tr("Show categories"), this); + QAction* showPathColAct = new QAction(tr("Show paths"), this); QAction* showResolutionColAct = new QAction(tr("Show Supported Resolutions"), this); QAction* showSoundFormatColAct = new QAction(tr("Show Sound Formats"), this); QAction* showParentalLevelColAct = new QAction(tr("Show Parental Levels"), this); @@ -637,13 +637,13 @@ void game_list_frame::ShowSpecifiedContextMenu(const QPoint &pos, int row) QAction* configure = myMenu.addAction(tr("&Configure")); myMenu.addSeparator(); QAction* removeGame = myMenu.addAction(tr("&Remove")); - QAction* removeConfig = myMenu.addAction(tr("&Remove Custom Configuration")); - QAction* deleteShadersCache = myMenu.addAction(tr("&Delete Shaders Cache")); + QAction* removeConfig = myMenu.addAction(tr("&Remove custom configuration")); + QAction* deleteShadersCache = myMenu.addAction(tr("&Delete shaders cache")); myMenu.addSeparator(); - QAction* openGameFolder = myMenu.addAction(tr("&Open Install Folder")); - QAction* openConfig = myMenu.addAction(tr("&Open Config Folder")); + QAction* openGameFolder = myMenu.addAction(tr("&Open install folder")); + QAction* openConfig = myMenu.addAction(tr("&Open config folder")); myMenu.addSeparator(); - QAction* checkCompat = myMenu.addAction(tr("&Check Game Compatibility")); + QAction* checkCompat = myMenu.addAction(tr("&Check game compatibility")); connect(boot, &QAction::triggered, [=] { @@ -767,7 +767,7 @@ void game_list_frame::RemoveCustomConfiguration(int row) void game_list_frame::DeleteShadersCache(int row) { - if (QMessageBox::question(this, tr("Confirm Delete"), tr("Delete shaders cache?")) != QMessageBox::Yes) + if (QMessageBox::question(this, tr("Confirm delete"), tr("Delete shaders cache?")) != QMessageBox::Yes) return; const std::string config_base_dir = fs::get_config_dir() + "data/" + m_game_data[row].info.serial; diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index 3c86e4c7cf..176815a1a3 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -85,7 +85,7 @@ void gs_frame::keyPressEvent(QKeyEvent *keyEvent) case Qt::Key_R: if (keyEvent->modifiers() == Qt::ControlModifier && (!Emu.GetBoot().empty())) { Emu.Stop(); Emu.Load(); return; } break; - case Qt::Key_E: + case Qt::Key_F: if (keyEvent->modifiers() == Qt::ControlModifier) { if (Emu.IsReady()) { Emu.Run(); return; } diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3qt/kernel_explorer.cpp index 0c4a0d0408..8166b70e64 100644 --- a/rpcs3/rpcs3qt/kernel_explorer.cpp +++ b/rpcs3/rpcs3qt/kernel_explorer.cpp @@ -27,7 +27,7 @@ kernel_explorer::kernel_explorer(QWidget* parent) : QDialog(parent) { - setWindowTitle(tr("Kernel Explorer")); + setWindowTitle(tr("Kernel explorer")); setObjectName("kernel_explorer"); setAttribute(Qt::WA_DeleteOnClose); setMinimumSize(QSize(700, 450)); @@ -74,7 +74,7 @@ void kernel_explorer::Update() const u32 total_memory_usage = vm_block->used(); QTreeWidgetItem* root = new QTreeWidgetItem(); - root->setText(0, qstr(fmt::format("Process, ID = 0x00000001, Total Memory Usage = 0x%x (%0.2f MB)", total_memory_usage, (float)total_memory_usage / (1024 * 1024)))); + root->setText(0, qstr(fmt::format("Process, ID = 0x00000001, Total memory usage = 0x%x (%0.2f MB)", total_memory_usage, (float)total_memory_usage / (1024 * 1024)))); m_tree->addTopLevelItem(root); union name64 @@ -118,21 +118,21 @@ void kernel_explorer::Update() std::vector lv2_types(256); lv2_types[SYS_MEM_OBJECT] = l_addTreeChild(root, "Memory"); lv2_types[SYS_MUTEX_OBJECT] = l_addTreeChild(root, "Mutexes"); - lv2_types[SYS_COND_OBJECT] = l_addTreeChild(root, "Condition Variables"); - lv2_types[SYS_RWLOCK_OBJECT] = l_addTreeChild(root, "Reader Writer Locks"); - lv2_types[SYS_INTR_TAG_OBJECT] = l_addTreeChild(root, "Interrupt Tags"); - lv2_types[SYS_INTR_SERVICE_HANDLE_OBJECT] = l_addTreeChild(root, "Interrupt Service Handles"); - lv2_types[SYS_EVENT_QUEUE_OBJECT] = l_addTreeChild(root, "Event Queues"); - lv2_types[SYS_EVENT_PORT_OBJECT] = l_addTreeChild(root, "Event Ports"); + lv2_types[SYS_COND_OBJECT] = l_addTreeChild(root, "Condition variables"); + lv2_types[SYS_RWLOCK_OBJECT] = l_addTreeChild(root, "Reader writer locks"); + lv2_types[SYS_INTR_TAG_OBJECT] = l_addTreeChild(root, "Interrupt tags"); + lv2_types[SYS_INTR_SERVICE_HANDLE_OBJECT] = l_addTreeChild(root, "Interrupt service handles"); + lv2_types[SYS_EVENT_QUEUE_OBJECT] = l_addTreeChild(root, "Event queues"); + lv2_types[SYS_EVENT_PORT_OBJECT] = l_addTreeChild(root, "Event ports"); lv2_types[SYS_TRACE_OBJECT] = l_addTreeChild(root, "Traces"); lv2_types[SYS_SPUIMAGE_OBJECT] = l_addTreeChild(root, "SPU Images"); lv2_types[SYS_PRX_OBJECT] = l_addTreeChild(root, "Modules"); lv2_types[SYS_SPUPORT_OBJECT] = l_addTreeChild(root, "SPU Ports"); - lv2_types[SYS_LWMUTEX_OBJECT] = l_addTreeChild(root, "Light Weight Mutexes"); + lv2_types[SYS_LWMUTEX_OBJECT] = l_addTreeChild(root, "Light weight mutexes"); lv2_types[SYS_TIMER_OBJECT] = l_addTreeChild(root, "Timers"); lv2_types[SYS_SEMAPHORE_OBJECT] = l_addTreeChild(root, "Semaphores"); - lv2_types[SYS_LWCOND_OBJECT] = l_addTreeChild(root, "Light Weight Condition Variables"); - lv2_types[SYS_EVENT_FLAG_OBJECT] = l_addTreeChild(root, "Event Flags"); + lv2_types[SYS_LWCOND_OBJECT] = l_addTreeChild(root, "Light weight condition variables"); + lv2_types[SYS_EVENT_FLAG_OBJECT] = l_addTreeChild(root, "Event flags"); idm::select([&](u32 id, lv2_obj& obj) { @@ -170,26 +170,26 @@ void kernel_explorer::Update() case SYS_INTR_TAG_OBJECT: { // auto& tag = static_cast(obj); - l_addTreeChild(node, qstr(fmt::format("Intr Tag: ID = 0x%08x", id))); + l_addTreeChild(node, qstr(fmt::format("Intr tag: ID = 0x%08x", id))); break; } case SYS_INTR_SERVICE_HANDLE_OBJECT: { // auto& serv = static_cast(obj); - l_addTreeChild(node, qstr(fmt::format("Intr Svc: ID = 0x%08x", id))); + l_addTreeChild(node, qstr(fmt::format("Intr svc: ID = 0x%08x", id))); break; } case SYS_EVENT_QUEUE_OBJECT: { auto& eq = static_cast(obj); - l_addTreeChild(node, qstr(fmt::format("Event Queue: ID = 0x%08x \"%s\", %s, Key = %#llx, Events = %zu/%d, Waiters = %zu", id, +name64(eq.name), + l_addTreeChild(node, qstr(fmt::format("Event queue: ID = 0x%08x \"%s\", %s, Key = %#llx, Events = %zu/%d, Waiters = %zu", id, +name64(eq.name), eq.type == SYS_SPU_QUEUE ? "SPU" : "PPU", eq.key, eq.events.size(), eq.size, eq.sq.size()))); break; } case SYS_EVENT_PORT_OBJECT: { auto& ep = static_cast(obj); - l_addTreeChild(node, qstr(fmt::format("Event Port: ID = 0x%08x, Name = %#llx", id, ep.name))); + l_addTreeChild(node, qstr(fmt::format("Event port: ID = 0x%08x, Name = %#llx", id, ep.name))); break; } case SYS_TRACE_OBJECT: @@ -252,12 +252,12 @@ void kernel_explorer::Update() } }); - lv2_types.emplace_back(l_addTreeChild(root, "Memory Containers")); + lv2_types.emplace_back(l_addTreeChild(root, "Memory containers")); idm::select([&](u32 id, lv2_memory_container&) { lv2_types.back().count++; - l_addTreeChild(lv2_types.back().node, qstr(fmt::format("Memory Container: ID = 0x%08x", id))); + l_addTreeChild(lv2_types.back().node, qstr(fmt::format("Memory container: ID = 0x%08x", id))); }); lv2_types.emplace_back(l_addTreeChild(root, "PPU Threads")); @@ -276,15 +276,15 @@ void kernel_explorer::Update() l_addTreeChild(lv2_types.back().node, qstr(fmt::format("SPU Thread: ID = 0x%08x '%s'", id, spu.get_name()))); }); - lv2_types.emplace_back(l_addTreeChild(root, "SPU Thread Groups")); + lv2_types.emplace_back(l_addTreeChild(root, "SPU Thread groups")); idm::select([&](u32 id, lv2_spu_group& tg) { lv2_types.back().count++; - l_addTreeChild(lv2_types.back().node, qstr(fmt::format("SPU Thread Group: ID = 0x%08x '%s'", id, tg.name))); + l_addTreeChild(lv2_types.back().node, qstr(fmt::format("SPU Thread group: ID = 0x%08x '%s'", id, tg.name))); }); - lv2_types.emplace_back(l_addTreeChild(root, "File Descriptors")); + lv2_types.emplace_back(l_addTreeChild(root, "File descriptors")); idm::select([&](u32 id, lv2_fs_object& fo) { diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 2db356e327..574a23ec77 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -303,7 +303,7 @@ void main_window::BootGame() } QString path_last_Game = guiSettings->GetValue(GUI::fd_boot_game).toString(); - QString dirPath = QFileDialog::getExistingDirectory(this, tr("Select Game Folder"), path_last_Game, QFileDialog::ShowDirsOnly); + QString dirPath = QFileDialog::getExistingDirectory(this, tr("Select game folder"), path_last_Game, QFileDialog::ShowDirsOnly); if (dirPath == NULL) { @@ -830,7 +830,7 @@ void main_window::OnEmuPause() m_thumb_playPause->setToolTip(tr("Resume emulation")); m_thumb_playPause->setIcon(m_icon_thumb_play); #endif - ui->sysPauseAct->setText(tr("&Resume\tCtrl+E")); + ui->sysPauseAct->setText(tr("&Resume\tCtrl+F")); ui->sysPauseAct->setIcon(m_icon_play); ui->toolbar_start->setIcon(m_icon_play); ui->toolbar_start->setToolTip(tr("Resume emulation")); @@ -1196,12 +1196,12 @@ void main_window::CreateConnects() connect(ui->sysPauseAct, &QAction::triggered, Pause); connect(ui->sysStopAct, &QAction::triggered, [=]() { Emu.Stop(); }); connect(ui->sysRebootAct, &QAction::triggered, [=]() { Emu.Stop(); Emu.Load(); }); - + connect(ui->sysSendOpenMenuAct, &QAction::triggered, [=] { sysutil_send_system_cmd(m_sys_menu_opened ? 0x0132 /* CELL_SYSUTIL_SYSTEM_MENU_CLOSE */ : 0x0131 /* CELL_SYSUTIL_SYSTEM_MENU_OPEN */, 0); m_sys_menu_opened = !m_sys_menu_opened; - ui->sysSendOpenMenuAct->setText(tr("Send &%0 system menu cmd").arg(m_sys_menu_opened ? tr("close") : tr("open"))); + ui->sysSendOpenMenuAct->setText(tr("Press &%0 PS button").arg(m_sys_menu_opened ? tr("close") : tr("open"))); }); connect(ui->sysSendExitAct, &QAction::triggered, [=] @@ -1597,7 +1597,7 @@ void main_window::keyPressEvent(QKeyEvent *keyEvent) { switch (keyEvent->key()) { - case Qt::Key_E: if (Emu.IsPaused()) Emu.Resume(); else if (Emu.IsReady()) Emu.Run(); return; + case Qt::Key_F: if (Emu.IsPaused()) Emu.Resume(); else if (Emu.IsReady()) Emu.Run(); return; case Qt::Key_P: if (Emu.IsRunning()) Emu.Pause(); return; case Qt::Key_S: if (!Emu.IsStopped()) Emu.Stop(); return; case Qt::Key_R: if (!Emu.GetBoot().empty()) { Emu.Stop(); Emu.Run(); } return; diff --git a/rpcs3/rpcs3qt/memory_string_searcher.cpp b/rpcs3/rpcs3qt/memory_string_searcher.cpp index 34f12ab6ee..0a63bb6301 100644 --- a/rpcs3/rpcs3qt/memory_string_searcher.cpp +++ b/rpcs3/rpcs3qt/memory_string_searcher.cpp @@ -4,7 +4,7 @@ memory_string_searcher::memory_string_searcher(QWidget* parent) : QDialog(parent) { - setWindowTitle(tr("String Searcher")); + setWindowTitle(tr("String searcher")); setAttribute(Qt::WA_DeleteOnClose); setFixedSize(QSize(545, 64)); diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp index a8f59a3f37..b1ac78c845 100644 --- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp +++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp @@ -8,7 +8,7 @@ constexpr auto qstr = QString::fromStdString; memory_viewer_panel::memory_viewer_panel(QWidget* parent) : QDialog(parent) { - setWindowTitle(tr("Memory Viewer")); + setWindowTitle(tr("Memory viewer")); setObjectName("memory_viewer"); setAttribute(Qt::WA_DeleteOnClose); exit = false; @@ -29,7 +29,7 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent) QHBoxLayout* hbox_tools = new QHBoxLayout(); //Tools: Memory Viewer Options - QGroupBox* tools_mem = new QGroupBox(tr("Memory Viewer Options")); + QGroupBox* tools_mem = new QGroupBox(tr("Memory viewer options")); QHBoxLayout* hbox_tools_mem = new QHBoxLayout(); //Tools: Memory Viewer Options: Address @@ -81,7 +81,7 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent) tools_mem->setLayout(hbox_tools_mem); //Tools: Raw Image Preview Options - QGroupBox* tools_img = new QGroupBox(tr("Raw Image Preview Options")); + QGroupBox* tools_img = new QGroupBox(tr("Raw image preview options")); QHBoxLayout* hbox_tools_img = new QHBoxLayout();; //Tools: Raw Image Preview Options : Size @@ -389,7 +389,7 @@ void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, int mode, u32 wid layout->addWidget(canvas); QDialog* f_image_viewer = new QDialog(parent); - f_image_viewer->setWindowTitle(qstr(fmt::format("Raw Image @ 0x%x", addr))); + f_image_viewer->setWindowTitle(qstr(fmt::format("Raw image @ 0x%x", addr))); f_image_viewer->setFixedSize(QSize(width, height)); f_image_viewer->setLayout(layout); f_image_viewer->show(); diff --git a/rpcs3/rpcs3qt/rsx_debugger.cpp b/rpcs3/rpcs3qt/rsx_debugger.cpp index d06f189774..17719ad5c9 100644 --- a/rpcs3/rpcs3qt/rsx_debugger.cpp +++ b/rpcs3/rpcs3qt/rsx_debugger.cpp @@ -1,4 +1,4 @@ - + #include "rsx_debugger.h" enum GCMEnumTypes @@ -29,7 +29,7 @@ rsx_debugger::rsx_debugger(QWidget* parent) QVBoxLayout* vbox_tools = new QVBoxLayout(); // Controls - QGroupBox* gb_controls = new QGroupBox(tr("RSX Debugger Controls"), this); + QGroupBox* gb_controls = new QGroupBox(tr("RSX Debugger controls"), this); QHBoxLayout* hbox_controls = new QHBoxLayout(); // Controls: Address @@ -110,8 +110,8 @@ rsx_debugger::rsx_debugger(QWidget* parent) }; m_list_commands = l_addRSXTab(m_list_commands, tr("RSX Commands"), 4); - m_list_captured_frame = l_addRSXTab(m_list_captured_frame, tr("Captured Frame"), 1); - m_list_captured_draw_calls = l_addRSXTab(m_list_captured_draw_calls, tr("Captured Draw Calls"), 1); + m_list_captured_frame = l_addRSXTab(m_list_captured_frame, tr("Captured frame"), 1); + m_list_captured_draw_calls = l_addRSXTab(m_list_captured_draw_calls, tr("Captured draw calls"), 1); m_list_flags = l_addRSXTab(m_list_flags, tr("Flags"), 2); m_list_lightning = l_addRSXTab(m_list_lightning, tr("Lightning"), 2); m_list_texture = l_addRSXTab(m_list_texture, tr("Texture"), 9); @@ -193,12 +193,12 @@ rsx_debugger::rsx_debugger(QWidget* parent) //Buffers QVBoxLayout* vbox_buffers1 = new QVBoxLayout(); QVBoxLayout* vbox_buffers2 = new QVBoxLayout(); - QGroupBox* gb_buffers_colorA = new QGroupBox(tr("Color Buffer A"), p_buffers); - QGroupBox* gb_buffers_colorB = new QGroupBox(tr("Color Buffer B"), p_buffers); - QGroupBox* gb_buffers_colorC = new QGroupBox(tr("Color Buffer C"), p_buffers); - QGroupBox* gb_buffers_colorD = new QGroupBox(tr("Color Buffer D"), p_buffers); - QGroupBox* gb_buffers_depth = new QGroupBox(tr("Depth Buffer"), p_buffers); - QGroupBox* gb_buffers_stencil = new QGroupBox(tr("Stencil Buffer"), p_buffers); + QGroupBox* gb_buffers_colorA = new QGroupBox(tr("Color buffer A"), p_buffers); + QGroupBox* gb_buffers_colorB = new QGroupBox(tr("Color buffer B"), p_buffers); + QGroupBox* gb_buffers_colorC = new QGroupBox(tr("Color buffer C"), p_buffers); + QGroupBox* gb_buffers_colorD = new QGroupBox(tr("Color buffer D"), p_buffers); + QGroupBox* gb_buffers_depth = new QGroupBox(tr("Depth buffer"), p_buffers); + QGroupBox* gb_buffers_stencil = new QGroupBox(tr("Stencil buffer"), p_buffers); QGroupBox* gb_buffers_text = new QGroupBox(tr("Texture"), p_buffers); QHBoxLayout* hbox_buffers_colorA = new QHBoxLayout(); QHBoxLayout* hbox_buffers_colorB = new QHBoxLayout(); @@ -1062,7 +1062,7 @@ const char* rsx_debugger::ParseGCMEnum(u32 value, u32 type) case 0xF006: return "Add Signed"; case 0xF007: return "Reverse Add Signed"; - default: return "Wrong Value!"; + default: return "Wrong value!"; } } case CELL_GCM_PRIMITIVE_ENUM: @@ -1080,7 +1080,7 @@ const char* rsx_debugger::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!"; @@ -1150,7 +1150,7 @@ QString rsx_debugger::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; @@ -1176,7 +1176,7 @@ QString rsx_debugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA if((cmd & RSX_METHOD_NON_INCREMENT_CMD_MASK) == RSX_METHOD_NON_INCREMENT_CMD) { - DISASM("Non Increment cmd"); + DISASM("Non increment cmd"); } DISASM("[0x%08x(", cmd); diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.cpp b/rpcs3/rpcs3qt/save_data_list_dialog.cpp index 3e1eb0abd5..810dfbdbc1 100644 --- a/rpcs3/rpcs3qt/save_data_list_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_list_dialog.cpp @@ -15,7 +15,7 @@ constexpr auto qstr = QString::fromStdString; save_data_list_dialog::save_data_list_dialog(const std::vector& entries, s32 focusedEntry, bool is_saving, QWidget* parent) : QDialog(parent), m_save_entries(entries), m_entry(-1), m_entry_label(nullptr) { - setWindowTitle(tr("Save Data Interface")); + setWindowTitle(tr("Save data interface")); setWindowIcon(QIcon(":/rpcs3.ico")); setMinimumSize(QSize(400, 400)); @@ -34,7 +34,7 @@ save_data_list_dialog::save_data_list_dialog(const std::vector& e if (entries.size() > 0) { // If there are no entries, don't add the selection widget or the selection label to the UI. - QPushButton *push_select = new QPushButton(tr("&Select Entry"), this); + QPushButton *push_select = new QPushButton(tr("&Select entry"), this); connect(push_select, &QAbstractButton::clicked, this, &save_data_list_dialog::accept); push_select->setAutoDefault(true); push_select->setDefault(true); @@ -46,7 +46,7 @@ save_data_list_dialog::save_data_list_dialog(const std::vector& e if (is_saving) { - QPushButton *saveNewEntry = new QPushButton(tr("Save New Entry"), this); + QPushButton *saveNewEntry = new QPushButton(tr("Save new entry"), this); connect(saveNewEntry, &QAbstractButton::clicked, this, [&]() { m_entry = -1; // Set the return properly. @@ -106,12 +106,12 @@ void save_data_list_dialog::UpdateSelectionLabel() { if (m_list->currentRow() == -1) { - m_entry_label->setText(tr("Currently Selected: None")); + m_entry_label->setText(tr("Currently selected: None")); } else { int entry = m_list->item(m_list->currentRow(), 0)->data(Qt::UserRole).toInt(); - m_entry_label->setText(tr("Currently Selected: ") + qstr(m_save_entries[entry].dirName)); + m_entry_label->setText(tr("Currently selected: ") + qstr(m_save_entries[entry].dirName)); } } }