mirror of
https://github.com/RPCS3/rpcs3.git
synced 2026-03-10 23:45:16 +01:00
ui: Merge exit/boot game dialog options
This commit is contained in:
parent
139e092173
commit
a6198b6271
|
|
@ -2165,7 +2165,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
|
|||
SubscribeTooltip(ui->cb_custom_colors, tooltips.settings.custom_colors);
|
||||
SubscribeTooltip(ui->cb_show_welcome, tooltips.settings.show_welcome);
|
||||
SubscribeTooltip(ui->cb_show_exit_game, tooltips.settings.show_exit_game);
|
||||
SubscribeTooltip(ui->cb_show_boot_game, tooltips.settings.show_boot_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);
|
||||
|
|
@ -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_boot_game->setChecked(m_gui_settings->GetValue(gui::ib_confirm_boot).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());
|
||||
|
|
@ -2305,9 +2303,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
|
|||
connect(ui->cb_show_exit_game, &QCheckBox::toggled, [this](bool checked)
|
||||
{
|
||||
m_gui_settings->SetValue(gui::ib_confirm_exit, checked);
|
||||
});
|
||||
connect(ui->cb_show_boot_game, &QCheckBox::toggled, [this](bool checked)
|
||||
{
|
||||
m_gui_settings->SetValue(gui::ib_confirm_boot, checked);
|
||||
});
|
||||
connect(ui->cb_show_pkg_install, &QCheckBox::toggled, [this](bool checked)
|
||||
|
|
|
|||
|
|
@ -4007,14 +4007,7 @@
|
|||
<item>
|
||||
<widget class="QCheckBox" name="cb_show_exit_game">
|
||||
<property name="text">
|
||||
<string>Show Exit Game Dialog</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cb_show_boot_game">
|
||||
<property name="text">
|
||||
<string>Show Boot Game Dialog</string>
|
||||
<string>Show Exit Game Confirmation</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
|||
|
|
@ -216,8 +216,7 @@ public:
|
|||
const QString tty_limit = tr("Sets the maximum amount of blocks that the TTY can display.\nThis usually equals the number of lines.\nSet 0 in order to remove the limit.");
|
||||
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.");
|
||||
const QString show_boot_game = tr("Shows a confirmation dialog when a game was booted while another game is running.");
|
||||
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_obsolete_cfg = tr("Shows a dialog when obsolete settings were found.");
|
||||
|
|
|
|||
Loading…
Reference in a new issue