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

Change order of disableTrophy and related Qt objects

Browse Source 
This should (actually) fix any conflicts with 433d9459e0
This commit is contained in:
tomboylover93 2024-12-22 13:07:46 -03:00
parent e63fa963a3
commit 88938e7ead
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt_gui/settings_dialog.cpp
View File

@ -196,6 +196,7 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidge
#endif #endif
ui->GUIgroupBox->installEventFilter(this); ui->GUIgroupBox->installEventFilter(this);
ui->widgetComboBox->installEventFilter(this); ui->widgetComboBox->installEventFilter(this);
ui->disableTrophycheckBox->installEventFilter(this);
// Input // Input
ui->hideCursorGroupBox->installEventFilter(this); ui->hideCursorGroupBox->installEventFilter(this);
@ -268,6 +269,8 @@ void SettingsDialog::LoadValuesFromConfig() {
ui->BGMVolumeSlider->setValue(toml::find_or<int>(data, "General", "BGMvolume", 50)); ui->BGMVolumeSlider->setValue(toml::find_or<int>(data, "General", "BGMvolume", 50));
ui->currentwidgetComboBox->setCurrentText( ui->currentwidgetComboBox->setCurrentText(
QString::fromStdString(toml::find_or<std::string>(data, "GUI", "widgetStyle", "fusion"))); QString::fromStdString(toml::find_or<std::string>(data, "GUI", "widgetStyle", "fusion")));
ui->disableTrophycheckBox->setChecked(
toml::find_or<bool>(data, "General", "isTrophyPopupDisabled", false));
ui->discordRPCCheckbox->setChecked( ui->discordRPCCheckbox->setChecked(
toml::find_or<bool>(data, "General", "enableDiscordRPC", true)); toml::find_or<bool>(data, "General", "enableDiscordRPC", true));
ui->fullscreenCheckBox->setChecked(toml::find_or<bool>(data, "General", "Fullscreen", false)); ui->fullscreenCheckBox->setChecked(toml::find_or<bool>(data, "General", "Fullscreen", false));
@ -403,6 +406,8 @@ void SettingsDialog::updateNoteTextEdit(const QString& elementName) {
text = tr("GUIgroupBox"); text = tr("GUIgroupBox");
} else if (elementName == "widgetComboBox") { } else if (elementName == "widgetComboBox") {
text = tr("widgetComboBox"); text = tr("widgetComboBox");
} else if (elementName == "disableTrophycheckBox") {
text = tr("disableTrophycheckBox");
} }
// Input // Input

5
src/qt_gui/translations/en.ts
View File

@ -1206,6 +1206,11 @@
<source>widgetComboBox</source> <source>widgetComboBox</source>
<translation>Widget Styles:\nChoose the widget style to be applied at startup. Defaults to Fusion. "System" uses your system's widget style (Breeze, Oxygen, Kvantum etc). Requires an app restart to apply.</translation> <translation>Widget Styles:\nChoose the widget style to be applied at startup. Defaults to Fusion. "System" uses your system's widget style (Breeze, Oxygen, Kvantum etc). Requires an app restart to apply.</translation>
</message> </message>
<message>
<location filename="../settings_dialog.cpp" line="267"/>
<source>disableTrophycheckBox</source>
<translation>Disable Trophy Pop-ups:\nDisable in-game trophy notifications. Trophy progress can still be tracked using the Trophy Viewer (right-click the game in the main window).</translation>
</message>
<message> <message>
<location filename="../settings_dialog.cpp" line="450"/> <location filename="../settings_dialog.cpp" line="450"/>
<source>hideCursorGroupBox</source> <source>hideCursorGroupBox</source>