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

Fix some misspells 

Note: in main.cpp there are many dirs similar to Program Files, so tip should be appropriate.
This commit is contained in:
sampletext32 2020-05-19 21:11:53 +03:00 committed by Ivan
parent c47d04fd2f
commit 1a8fb61373
9 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/Cell/Modules/sceNp.cpp
View File

@ -439,7 +439,7 @@ error_code npDrmIsAvailable(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_pat
if (Emu.GetCat() == "PE") if (Emu.GetCat() == "PE")
{ {
std::copy_n(NP_PSP_KEY_2, std::size(NP_PSP_KEY_2), k_licensee.begin()); std::copy_n(NP_PSP_KEY_2, std::size(NP_PSP_KEY_2), k_licensee.begin());
sceNp.success("npDrmIsAvailable(): PSP remaster KLicense key apllied."); sceNp.success("npDrmIsAvailable(): PSP remaster KLicense key applied.");
} }
const std::string enc_drm_path(drm_path.get_ptr(), std::find(drm_path.get_ptr(), drm_path.get_ptr() + 0x100, '\0')); const std::string enc_drm_path(drm_path.get_ptr(), std::find(drm_path.get_ptr(), drm_path.get_ptr() + 0x100, '\0'));

2
rpcs3/Emu/Cell/PPUTranslator.cpp
View File

@ -83,7 +83,7 @@ PPUTranslator::PPUTranslator(LLVMContext& context, Module* _module, const ppu_mo
switch (rel.type) switch (rel.type)
{ {
// Ignore relative relocations, they are handled in emmitted code // Ignore relative relocations, they are handled in emitted code
// Comment out types we haven't confirmed as used and working // Comment out types we haven't confirmed as used and working
case 10: case 10:
case 11: case 11:

2
rpcs3/main.cpp
View File

@ -311,7 +311,7 @@ int main(int argc, char** argv)
{ {
report_fatal_error("Cannot create RPCS3.log (access denied)." report_fatal_error("Cannot create RPCS3.log (access denied)."
#ifdef _WIN32 #ifdef _WIN32
"\nNote that RPCS3 cannot be installed in Program Files or similar directory with limited permissions." "\nNote that RPCS3 cannot be installed in Program Files or similar directories with limited permissions."
#else #else
"\nPlease, check RPCS3 permissions in '~/.config/rpcs3'." "\nPlease, check RPCS3 permissions in '~/.config/rpcs3'."
#endif #endif

24
rpcs3/rpcs3qt/main_window.cpp
View File

@ -129,13 +129,13 @@ void main_window::Init()
// enable play options if a recent game exists // enable play options if a recent game exists
const bool enable_play_last = !m_recent_game_acts.isEmpty() && m_recent_game_acts.first(); const bool enable_play_last = !m_recent_game_acts.isEmpty() && m_recent_game_acts.first();
const QString start_toolip = enable_play_last ? tr("Play %0").arg(m_recent_game_acts.first()->text()) : tr("Play"); const QString start_tooltip = enable_play_last ? tr("Play %0").arg(m_recent_game_acts.first()->text()) : tr("Play");
if (enable_play_last) if (enable_play_last)
{ {
ui->sysPauseAct->setText(tr("&Play last played game\tCtrl+E")); ui->sysPauseAct->setText(tr("&Play last played game\tCtrl+E"));
ui->sysPauseAct->setIcon(m_icon_play); ui->sysPauseAct->setIcon(m_icon_play);
ui->toolbar_start->setToolTip(start_toolip); ui->toolbar_start->setToolTip(start_tooltip);
} }
ui->sysPauseAct->setEnabled(enable_play_last); ui->sysPauseAct->setEnabled(enable_play_last);
@ -147,7 +147,7 @@ void main_window::Init()
m_thumb_bar->setWindow(windowHandle()); m_thumb_bar->setWindow(windowHandle());
m_thumb_playPause = new QWinThumbnailToolButton(m_thumb_bar); m_thumb_playPause = new QWinThumbnailToolButton(m_thumb_bar);
m_thumb_playPause->setToolTip(start_toolip); m_thumb_playPause->setToolTip(start_tooltip);
m_thumb_playPause->setIcon(m_icon_thumb_play); m_thumb_playPause->setIcon(m_icon_thumb_play);
m_thumb_playPause->setEnabled(enable_play_last); m_thumb_playPause->setEnabled(enable_play_last);
@ -677,11 +677,11 @@ void main_window::HandlePupInstallation(QString file_path)
fs::file update_files_f = pup.get_file(0x300); fs::file update_files_f = pup.get_file(0x300);
tar_object update_files(update_files_f); tar_object update_files(update_files_f);
auto updatefilenames = update_files.get_filenames(); auto update_filenames = update_files.get_filenames();
updatefilenames.erase(std::remove_if( update_filenames.erase(std::remove_if(
updatefilenames.begin(), updatefilenames.end(), [](std::string s) { return s.find("dev_flash_") == umax; }), update_filenames.begin(), update_filenames.end(), [](std::string s) { return s.find("dev_flash_") == umax; }),
updatefilenames.end()); update_filenames.end());
std::string version_string = pup.get_file(0x100).to_string(); std::string version_string = pup.get_file(0x100).to_string();
@ -699,7 +699,7 @@ void main_window::HandlePupInstallation(QString file_path)
return; return;
} }
progress_dialog pdlg(tr("RPCS3 Firmware Installer"), tr("Installing firmware version %1\nPlease wait...").arg(qstr(version_string)), tr("Cancel"), 0, static_cast<int>(updatefilenames.size()), false, this); progress_dialog pdlg(tr("RPCS3 Firmware Installer"), tr("Installing firmware version %1\nPlease wait...").arg(qstr(version_string)), tr("Cancel"), 0, static_cast<int>(update_filenames.size()), false, this);
pdlg.show(); pdlg.show();
// Synchronization variable // Synchronization variable
@ -708,13 +708,13 @@ void main_window::HandlePupInstallation(QString file_path)
// Run asynchronously // Run asynchronously
named_thread worker("Firmware Installer", [&] named_thread worker("Firmware Installer", [&]
{ {
for (const auto& updatefilename : updatefilenames) for (const auto& update_filename : update_filenames)
{ {
if (progress == -1) break; if (progress == -1) break;
fs::file updatefile = update_files.get_file(updatefilename); fs::file update_file = update_files.get_file(update_filename);
SCEDecrypter self_dec(updatefile); SCEDecrypter self_dec(update_file);
self_dec.LoadHeaders(); self_dec.LoadHeaders();
self_dec.LoadMetadata(SCEPKG_ERK, SCEPKG_RIV); self_dec.LoadMetadata(SCEPKG_ERK, SCEPKG_RIV);
self_dec.DecryptData(); self_dec.DecryptData();
@ -832,7 +832,7 @@ void main_window::DecryptSPRXLibraries()
gui_log.notice("Finished decrypting all binaries."); gui_log.notice("Finished decrypting all binaries.");
} }
/** Needed so that when a backup occurs of window state in guisettings, the state is current. /** Needed so that when a backup occurs of window state in gui_settings, the state is current.
* Also, so that on close, the window state is preserved. * Also, so that on close, the window state is preserved.
*/ */
void main_window::SaveWindowState() void main_window::SaveWindowState()

4
rpcs3/rpcs3qt/main_window.ui
View File

@ -233,7 +233,7 @@
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionManage_Users"/> <addaction name="actionManage_Users"/>
<addaction name="confSavedataManagerAct"/> <addaction name="confSavedataManagerAct"/>
<addaction name="actionManage_RAP_Licences"/> <addaction name="actionManage_RAP_Licenses"/>
<addaction name="actionManage_Trophy_Data"/> <addaction name="actionManage_Trophy_Data"/>
<addaction name="actionManage_Skylanders_Portal"/> <addaction name="actionManage_Skylanders_Portal"/>
<addaction name="actionManage_Cheats"/> <addaction name="actionManage_Cheats"/>
@ -651,7 +651,7 @@
<string>Game List Refresh</string> <string>Game List Refresh</string>
</property> </property>
</action> </action>
<action name="actionManage_RAP_Licences"> <action name="actionManage_RAP_Licenses">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>

1
rpcs3/rpcs3qt/pad_settings_dialog.ui
View File

@ -2324,7 +2324,6 @@
</widget> </widget>
<resources> <resources>
<include location="../resources.qrc"/> <include location="../resources.qrc"/>
<include location="../resources.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

8
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -408,15 +408,15 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
}); });
ui->disableVertexCache->setEnabled(!ui->multithreadedRSX->isChecked()); ui->disableVertexCache->setEnabled(!ui->multithreadedRSX->isChecked());
m_emu_settings->EnhanceCheckBox(ui->scrictModeRendering, emu_settings_type::StrictRenderingMode); m_emu_settings->EnhanceCheckBox(ui->strictModeRendering, emu_settings_type::StrictRenderingMode);
SubscribeTooltip(ui->scrictModeRendering, tooltips.settings.strict_rendering_mode); SubscribeTooltip(ui->strictModeRendering, tooltips.settings.strict_rendering_mode);
const auto onStrictRenderingMode = [this](bool checked) const auto onStrictRenderingMode = [this](bool checked)
{ {
ui->gb_resolutionScale->setEnabled(!checked); ui->gb_resolutionScale->setEnabled(!checked);
ui->gb_minimumScalableDimension->setEnabled(!checked); ui->gb_minimumScalableDimension->setEnabled(!checked);
ui->gb_anisotropicFilter->setEnabled(!checked); ui->gb_anisotropicFilter->setEnabled(!checked);
}; };
connect(ui->scrictModeRendering, &QCheckBox::clicked, this, onStrictRenderingMode); connect(ui->strictModeRendering, &QCheckBox::clicked, this, onStrictRenderingMode);
// Radio buttons // Radio buttons
@ -617,7 +617,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
}; };
// Handle connects to disable specific checkboxes that depend on GUI state. // Handle connects to disable specific checkboxes that depend on GUI state.
onStrictRenderingMode(ui->scrictModeRendering->isChecked()); onStrictRenderingMode(ui->strictModeRendering->isChecked());
fix_gl_legacy(ui->renderBox->currentText()); // Init fix_gl_legacy(ui->renderBox->currentText()); // Init
connect(ui->renderBox, &QComboBox::currentTextChanged, fix_gl_legacy); connect(ui->renderBox, &QComboBox::currentTextChanged, fix_gl_legacy);

4
rpcs3/rpcs3qt/settings_dialog.ui
View File

@ -702,7 +702,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="scrictModeRendering"> <widget class="QCheckBox" name="strictModeRendering">
<property name="text"> <property name="text">
<string>Strict Rendering Mode</string> <string>Strict Rendering Mode</string>
</property> </property>
@ -2064,7 +2064,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="wakeupDelayLAyout" stretch="1,0"> <layout class="QHBoxLayout" name="wakeupDelayLayout" stretch="1,0">
<item> <item>
<widget class="QLabel" name="wakeupText"> <widget class="QLabel" name="wakeupText">
<property name="text"> <property name="text">

3
rpcs3/rpcs3qt/welcome_dialog.ui
View File

@ -282,9 +282,6 @@
</widget> </widget>
<resources> <resources>
<include location="../resources.qrc"/> <include location="../resources.qrc"/>
<include location="../resources.qrc"/>
<include location="../resources.qrc"/>
<include location="../resources.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>