claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaks to the "save settings" dialog

Browse Source 
Changed the Cancel button to a regular button, as per the MS guidelines
Also changed the caption for when invoked by the close button
This commit is contained in:
David Hrdlička
2020-11-19 23:22:46 +01:00
parent 7c078d4be1
commit ba16597d21
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/language.h
View File

@@ -96,7 +96,7 @@
#define IDS_2120 2120 // "No ROMs found" #define IDS_2120 2120 // "No ROMs found"
#define IDS_2121 2121 // "Save changes\nThis will hard..." #define IDS_2121 2121 // "Save changes\nThis will hard..."
#define IDS_2122 2122 // "Discard changes\nAll changes..." #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_2124 2124 // "About 86Box"
#define IDS_2125 2125 // "86Box v" EMU_VERSION #define IDS_2125 2125 // "86Box v" EMU_VERSION
#define IDS_2126 2126 // "An emulator of old computers..." #define IDS_2126 2126 // "An emulator of old computers..."

2
src/win/86Box.rc
View File

@@ -988,7 +988,7 @@ BEGIN
IDS_2120 "No ROMs found" IDS_2120 "No ROMs found"
IDS_2121 "Save changes\nThis will hard reset the emulated machine." 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_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_2124 "About 86Box"
IDS_2125 "86Box v" EMU_VERSION 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." 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."

6
src/win/win_settings.c
View File

@@ -495,7 +495,7 @@ win_settings_changed(void)
static int static int
settings_msgbox_reset(void) settings_msgbox_reset(int button)
{ {
int changed, i = 0; int changed, i = 0;
HWND h; HWND h;
@@ -506,7 +506,7 @@ settings_msgbox_reset(void)
h = hwndMain; h = hwndMain;
hwndMain = hwndParentDialog; 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; hwndMain = h;
@@ -4622,7 +4622,7 @@ win_settings_confirm(HWND hdlg, int button)
int i; int i;
SendMessage(hwndChildDialog, WM_SAVESETTINGS, 0, 0); SendMessage(hwndChildDialog, WM_SAVESETTINGS, 0, 0);
i = settings_msgbox_reset(); i = settings_msgbox_reset(button);
if (i > 0) { if (i > 0) {
if (i == 2) if (i == 2)
win_settings_save(); win_settings_save();