Skip to content

Commit 2d9ff45

Browse files
committed
ui: Merge exit/boot game dialog options
1 parent d0616c3 commit 2d9ff45

3 files changed

Lines changed: 2 additions & 15 deletions

File tree

rpcs3/rpcs3qt/settings_dialog.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,7 +2165,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
21652165
SubscribeTooltip(ui->cb_custom_colors, tooltips.settings.custom_colors);
21662166
SubscribeTooltip(ui->cb_show_welcome, tooltips.settings.show_welcome);
21672167
SubscribeTooltip(ui->cb_show_exit_game, tooltips.settings.show_exit_game);
2168-
SubscribeTooltip(ui->cb_show_boot_game, tooltips.settings.show_boot_game);
21692168
SubscribeTooltip(ui->cb_show_pkg_install, tooltips.settings.show_pkg_install);
21702169
SubscribeTooltip(ui->cb_show_pup_install, tooltips.settings.show_pup_install);
21712170
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
22732272

22742273
ui->cb_show_welcome->setChecked(m_gui_settings->GetValue(gui::ib_show_welcome).toBool());
22752274
ui->cb_show_exit_game->setChecked(m_gui_settings->GetValue(gui::ib_confirm_exit).toBool());
2276-
ui->cb_show_boot_game->setChecked(m_gui_settings->GetValue(gui::ib_confirm_boot).toBool());
22772275
ui->cb_show_pkg_install->setChecked(m_gui_settings->GetValue(gui::ib_pkg_success).toBool());
22782276
ui->cb_show_pup_install->setChecked(m_gui_settings->GetValue(gui::ib_pup_success).toBool());
22792277
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
23052303
connect(ui->cb_show_exit_game, &QCheckBox::toggled, [this](bool checked)
23062304
{
23072305
m_gui_settings->SetValue(gui::ib_confirm_exit, checked);
2308-
});
2309-
connect(ui->cb_show_boot_game, &QCheckBox::toggled, [this](bool checked)
2310-
{
23112306
m_gui_settings->SetValue(gui::ib_confirm_boot, checked);
23122307
});
23132308
connect(ui->cb_show_pkg_install, &QCheckBox::toggled, [this](bool checked)

rpcs3/rpcs3qt/settings_dialog.ui

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4007,14 +4007,7 @@
40074007
<item>
40084008
<widget class="QCheckBox" name="cb_show_exit_game">
40094009
<property name="text">
4010-
<string>Show Exit Game Dialog</string>
4011-
</property>
4012-
</widget>
4013-
</item>
4014-
<item>
4015-
<widget class="QCheckBox" name="cb_show_boot_game">
4016-
<property name="text">
4017-
<string>Show Boot Game Dialog</string>
4010+
<string>Show Exit Game Confirmation</string>
40184011
</property>
40194012
</widget>
40204013
</item>

rpcs3/rpcs3qt/tooltips.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,7 @@ class Tooltips : public QObject
216216
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.");
217217
const QString stylesheets = tr("Changes the overall look of RPCS3.\nChoose a stylesheet and click Apply to change between styles.");
218218
const QString show_welcome = tr("Shows the initial welcome screen upon starting RPCS3.");
219-
const QString show_exit_game = tr("Shows a confirmation dialog when the game window is being closed.");
220-
const QString show_boot_game = tr("Shows a confirmation dialog when a game was booted while another game is running.");
219+
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.");
221220
const QString show_pkg_install = tr("Shows a dialog when packages were installed successfully.");
222221
const QString show_pup_install = tr("Shows a dialog when firmware was installed successfully.");
223222
const QString show_obsolete_cfg = tr("Shows a dialog when obsolete settings were found.");

0 commit comments

Comments
 (0)