From ba16597d21611da161abdc4605d0de7d2d633dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Thu, 19 Nov 2020 23:22:46 +0100 Subject: [PATCH] Tweaks to the "save settings" dialog Changed the Cancel button to a regular button, as per the MS guidelines Also changed the caption for when invoked by the close button --- src/include/86box/language.h | 2 +- src/win/86Box.rc | 2 +- src/win/win_settings.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/include/86box/language.h b/src/include/86box/language.h index a16f2f0ac..46de31f5f 100644 --- a/src/include/86box/language.h +++ b/src/include/86box/language.h @@ -96,7 +96,7 @@ #define IDS_2120 2120 // "No ROMs found" #define IDS_2121 2121 // "Save changes\nThis will hard..." #define IDS_2122 2122 // "Discard changes\nAll changes..." -#define IDS_2123 2123 // "Cancel\nGo back to the..." +#define IDS_2123 2123 // "Do you want to save the settings?" #define IDS_2124 2124 // "About 86Box" #define IDS_2125 2125 // "86Box v" EMU_VERSION #define IDS_2126 2126 // "An emulator of old computers..." diff --git a/src/win/86Box.rc b/src/win/86Box.rc index d3529a82f..991e2df30 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -988,7 +988,7 @@ BEGIN IDS_2120 "No ROMs found" IDS_2121 "Save changes\nThis will hard reset the emulated machine." IDS_2122 "Discard changes\nAll changes made to the settings will be lost." - IDS_2123 "Cancel\nGo back to the Settings window." + IDS_2123 "Do you want to save the settings?" IDS_2124 "About 86Box" IDS_2125 "86Box v" EMU_VERSION IDS_2126 "An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information." diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 8c08d9ae2..9c25aa178 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -495,7 +495,7 @@ win_settings_changed(void) static int -settings_msgbox_reset(void) +settings_msgbox_reset(int button) { int changed, i = 0; HWND h; @@ -506,7 +506,7 @@ settings_msgbox_reset(void) h = hwndMain; hwndMain = hwndParentDialog; - i = ui_msgbox_ex(MBX_QUESTION | MBX_LINKS, (wchar_t *) IDS_2051, NULL, (wchar_t *) IDS_2121, (wchar_t *) IDS_2122, (wchar_t *) IDS_2123); + i = ui_msgbox_ex(MBX_QUESTION | MBX_LINKS, (wchar_t *) (button ? IDS_2051 : IDS_2123), NULL, (wchar_t *) IDS_2121, (wchar_t *) IDS_2122, NULL); hwndMain = h; @@ -4622,7 +4622,7 @@ win_settings_confirm(HWND hdlg, int button) int i; SendMessage(hwndChildDialog, WM_SAVESETTINGS, 0, 0); - i = settings_msgbox_reset(); + i = settings_msgbox_reset(button); if (i > 0) { if (i == 2) win_settings_save();