ui: Merge pkg/pup install dialog options

This commit is contained in:
AniLeo 2026-03-08 11:02:20 +01:00 committed by Ani
parent a6198b6271
commit 4e6694487b
3 changed files with 2 additions and 15 deletions

View file

@ -2166,7 +2166,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
SubscribeTooltip(ui->cb_show_welcome, tooltips.settings.show_welcome);
SubscribeTooltip(ui->cb_show_exit_game, tooltips.settings.show_exit_game);
SubscribeTooltip(ui->cb_show_pkg_install, tooltips.settings.show_pkg_install);
SubscribeTooltip(ui->cb_show_pup_install, tooltips.settings.show_pup_install);
SubscribeTooltip(ui->cb_show_obsolete_cfg_dialog, tooltips.settings.show_obsolete_cfg);
SubscribeTooltip(ui->cb_show_same_buttons_dialog, tooltips.settings.show_same_buttons);
SubscribeTooltip(ui->cb_show_restart_hint, tooltips.settings.show_restart_hint);
@ -2273,7 +2272,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
ui->cb_show_welcome->setChecked(m_gui_settings->GetValue(gui::ib_show_welcome).toBool());
ui->cb_show_exit_game->setChecked(m_gui_settings->GetValue(gui::ib_confirm_exit).toBool());
ui->cb_show_pkg_install->setChecked(m_gui_settings->GetValue(gui::ib_pkg_success).toBool());
ui->cb_show_pup_install->setChecked(m_gui_settings->GetValue(gui::ib_pup_success).toBool());
ui->cb_show_obsolete_cfg_dialog->setChecked(m_gui_settings->GetValue(gui::ib_obsolete_cfg).toBool());
ui->cb_show_same_buttons_dialog->setChecked(m_gui_settings->GetValue(gui::ib_same_buttons).toBool());
ui->cb_show_restart_hint->setChecked(m_gui_settings->GetValue(gui::ib_restart_hint).toBool());
@ -2308,9 +2306,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
connect(ui->cb_show_pkg_install, &QCheckBox::toggled, [this](bool checked)
{
m_gui_settings->SetValue(gui::ib_pkg_success, checked);
});
connect(ui->cb_show_pup_install, &QCheckBox::toggled, [this](bool checked)
{
m_gui_settings->SetValue(gui::ib_pup_success, checked);
});
connect(ui->cb_show_obsolete_cfg_dialog, &QCheckBox::toggled, [this](bool checked)

View file

@ -4014,14 +4014,7 @@
<item>
<widget class="QCheckBox" name="cb_show_pkg_install">
<property name="text">
<string>Show PKG Installation Dialog</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_show_pup_install">
<property name="text">
<string>Show PUP Installation Dialog</string>
<string>Show PKG/PUP Installation Result</string>
</property>
</widget>
</item>

View file

@ -217,8 +217,7 @@ public:
const QString stylesheets = tr("Changes the overall look of RPCS3.\nChoose a stylesheet and click Apply to change between styles.");
const QString show_welcome = tr("Shows the initial welcome screen upon starting RPCS3.");
const QString show_exit_game = tr("Shows a confirmation dialog when the game window is being closed and when a game was booted while another game is running.");
const QString show_pkg_install = tr("Shows a dialog when packages were installed successfully.");
const QString show_pup_install = tr("Shows a dialog when firmware was installed successfully.");
const QString show_pkg_install = tr("Shows a dialog when packages and firmware were installed successfully.");
const QString show_obsolete_cfg = tr("Shows a dialog when obsolete settings were found.");
const QString show_same_buttons = tr("Shows a dialog in the game pad configuration when the same button was assigned twice.");
const QString show_restart_hint = tr("Shows a dialog when RPCS3 is ready to restart after an update.");