mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 08:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

better naming

Browse Source
This commit is contained in:
Fire Cube 2025-02-22 20:51:34 +01:00
parent 7ed94d8614
commit 978b7a0ab1
5 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/config.cpp
View File

@ -69,7 +69,7 @@ static bool vkHostMarkers = false;
static bool vkGuestMarkers = false;
static bool rdocEnable = false;
static bool isFpsColor = true;
static bool isSplitLogEnabled = false;
static bool isSeperateLogFilesEnabled = false;
static s16 cursorState = HideCursorState::Idle;
static int cursorHideTimeout = 5; // 5 seconds (default)
static bool useUnifiedInputConfig = true;
@ -452,8 +452,8 @@ void setLogFilter(const std::string& type) {
logFilter = type;
}
void setSplitLogEnabled(bool enabled) {
isSplitLogEnabled = enabled;
void setSeperateLogFilesEnabled(bool enabled) {
isSeperateLogFilesEnabled = enabled;
}
void setUserName(const std::string& type) {
@ -661,8 +661,8 @@ u32 GetLanguage() {
return m_language;
}
bool getSplitLogEnabled() {
return isSplitLogEnabled;
bool getSeperateLogFilesEnabled() {
return isSeperateLogFilesEnabled;
}
int getBackgroundImageOpacity() {
@ -770,7 +770,7 @@ void load(const std::filesystem::path& path) {
const toml::value& debug = data.at("Debug");
isDebugDump = toml::find_or<bool>(debug, "DebugDump", false);
isSplitLogEnabled = toml::find_or<bool>(debug, "isSplitLogEnabled", false);
isSeperateLogFilesEnabled = toml::find_or<bool>(debug, "isSeperateLogFilesEnabled", false);
isShaderDebug = toml::find_or<bool>(debug, "CollectShader", false);
isFpsColor = toml::find_or<bool>(debug, "FPSColor", true);
}
@ -897,7 +897,7 @@ void save(const std::filesystem::path& path) {
data["Vulkan"]["rdocEnable"] = rdocEnable;
data["Debug"]["DebugDump"] = isDebugDump;
data["Debug"]["CollectShader"] = isShaderDebug;
data["Debug"]["isSplitLogEnabled"] = isSplitLogEnabled;
data["Debug"]["isSeperateLogFilesEnabled"] = isSeperateLogFilesEnabled;
data["Debug"]["FPSColor"] = isFpsColor;
data["Keys"]["TrophyKey"] = trophyKey;

4
src/common/config.h
View File

@ -111,8 +111,8 @@ void setIsMotionControlsEnabled(bool use);
void setLogType(const std::string& type);
void setLogFilter(const std::string& type);
void setSplitLogEnabled(bool enabled);
bool getSplitLogEnabled();
void setSeperateLogFilesEnabled(bool enabled);
bool getSeperateLogFilesEnabled();
void setVkValidation(bool enable);
void setVkSyncValidation(bool enable);
void setRdocEnabled(bool enable);

2
src/emulator.cpp
View File

@ -114,7 +114,7 @@ void Emulator::Run(const std::filesystem::path& file, const std::vector<std::str
ASSERT_MSG(content_id.has_value(), "Failed to get CONTENT_ID");
id = std::string(*content_id, 7, 9);
if (Config::getSplitLogEnabled()) {
if (Config::getSeperateLogFilesEnabled()) {
Common::Log::Initialize(id + ".log");
}
else {

5
src/qt_gui/settings_dialog.cpp
View File

@ -404,7 +404,8 @@ void SettingsDialog::LoadValuesFromConfig() {
QString::fromStdString(toml::find_or<std::string>(data, "Keys", "TrophyKey", "")));
ui->trophyKeyLineEdit->setEchoMode(QLineEdit::Password);
ui->debugDump->setChecked(toml::find_or<bool>(data, "Debug", "DebugDump", false));
ui->splitLogCheckbox->setChecked(toml::find_or<bool>(data, "Debug", "isSplitLogEnabled", false));
ui->seperateLogFilesCheckbox->setChecked(
toml::find_or<bool>(data, "Debug", "isSeperateLogFilesEnabled", false));
ui->vkValidationCheckBox->setChecked(toml::find_or<bool>(data, "Vulkan", "validation", false));
ui->vkSyncValidationCheckBox->setChecked(
toml::find_or<bool>(data, "Vulkan", "validation_sync", false));
@ -680,7 +681,7 @@ void SettingsDialog::UpdateSettings() {
Config::setLoadGameSizeEnabled(ui->gameSizeCheckBox->isChecked());
Config::setShowSplash(ui->showSplashCheckBox->isChecked());
Config::setDebugDump(ui->debugDump->isChecked());
Config::setSplitLogEnabled(ui->splitLogCheckbox->isChecked());
Config::setSeperateLogFilesEnabled(ui->seperateLogFilesCheckbox->isChecked());
Config::setVkValidation(ui->vkValidationCheckBox->isChecked());
Config::setVkSyncValidation(ui->vkSyncValidationCheckBox->isChecked());
Config::setRdocEnabled(ui->rdocCheckBox->isChecked());

28
src/qt_gui/settings_dialog.ui
View File

@ -71,8 +71,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>536</height>
<width>718</width>
<height>332</height>
</rect>
</property>
<layout class="QVBoxLayout" name="generalTabVLayout" stretch="0">
@ -492,8 +492,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>536</height>
<width>646</width>
<height>395</height>
</rect>
</property>
<layout class="QVBoxLayout" name="guiTabVLayout" stretch="0">
@ -941,8 +941,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>536</height>
<width>545</width>
<height>141</height>
</rect>
</property>
<layout class="QVBoxLayout" name="graphicsTabVLayout" stretch="0,0">
@ -1185,8 +1185,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>536</height>
<width>234</width>
<height>292</height>
</rect>
</property>
<layout class="QVBoxLayout" name="userTabVLayout" stretch="0,0,1">
@ -1329,8 +1329,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>536</height>
<width>455</width>
<height>252</height>
</rect>
</property>
<layout class="QVBoxLayout" name="inputTabVLayout" stretch="0,0">
@ -1613,8 +1613,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>536</height>
<width>216</width>
<height>254</height>
</rect>
</property>
<layout class="QVBoxLayout" name="pathsTabLayout">
@ -1912,9 +1912,9 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="splitLogCheckbox">
<widget class="QCheckBox" name="seperateLogFilesCheckbox">
<property name="text">
<string>Split Log To Seperate Files For Games</string>
<string>Seperate Log Files</string>
</property>
</widget>
</item>