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

Update the Settings save confirmation dialog

Browse Source
This commit is contained in:
David Hrdlička
2020-11-20 15:39:33 +01:00
parent 98b57e9a4b
commit ca11d7b776
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,6 +114,9 @@
#define IDS_2138 2138 // "Don't Reset" #define IDS_2138 2138 // "Don't Reset"
#define IDS_2139 2139 // "MO images (*.IM?)\0*.IM?..." #define IDS_2139 2139 // "MO images (*.IM?)\0*.IM?..."
#define IDS_2140 2140 // "CD-ROM images (*.ISO;*.CU.." #define IDS_2140 2140 // "CD-ROM images (*.ISO;*.CU.."
#define IDS_2141 2141 // "Save"
#define IDS_2142 2142 // "Don't save"
#define IDS_2143 2143 // "This will hard reset the virtual..."
#define IDS_4096 4096 // "Hard disk (%s)" #define IDS_4096 4096 // "Hard disk (%s)"
#define IDS_4097 4097 // "%01i:%01i" #define IDS_4097 4097 // "%01i:%01i"
@@ -221,7 +224,7 @@
#define IDS_LANG_ENUS IDS_7168 #define IDS_LANG_ENUS IDS_7168
#define STR_NUM_2048 93 #define STR_NUM_2048 96
#define STR_NUM_3072 11 #define STR_NUM_3072 11
#define STR_NUM_4096 39 #define STR_NUM_4096 39
#define STR_NUM_4352 6 #define STR_NUM_4352 6

1
src/include/86box/ui.h
View File

@@ -34,6 +34,7 @@ extern "C" {
#define MBX_ERROR 2 #define MBX_ERROR 2
#define MBX_QUESTION 3 #define MBX_QUESTION 3
#define MBX_QUESTION_YN 4 #define MBX_QUESTION_YN 4
#define MBX_QUESTION_OK 8
#define MBX_QMARK 0x10 #define MBX_QMARK 0x10
#define MBX_WARNING 0x20 #define MBX_WARNING 0x20
#define MBX_FATAL 0x40 #define MBX_FATAL 0x40

3
src/win/86Box.rc
View File

@@ -1038,6 +1038,9 @@ BEGIN
IDS_2138 "Don't reset" IDS_2138 "Don't reset"
IDS_2139 "MO images (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0" IDS_2139 "MO images (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
IDS_2140 "CD-ROM images (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0" IDS_2140 "CD-ROM images (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0"
IDS_2141 "Save"
IDS_2142 "Don't save"
IDS_2143 "This will hard reset the virtual machine."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

5
src/win/win_dialog.c
View File

@@ -100,13 +100,14 @@ ui_msgbox_ex(int flags, void *header, void *message, void *btn1, void *btn2, voi
case MBX_QUESTION: /* question */ case MBX_QUESTION: /* question */
case MBX_QUESTION_YN: case MBX_QUESTION_YN:
case MBX_QUESTION_OK:
if (!btn1) /* replace default "OK" button with "Yes" button */ if (!btn1) /* replace default "OK" button with "Yes" button */
tdconfig.dwCommonButtons = TDCBF_YES_BUTTON; tdconfig.dwCommonButtons = (flags & MBX_QUESTION_OK) ? TDCBF_OK_BUTTON : TDCBF_YES_BUTTON;
if (btn2) /* "No" button */ if (btn2) /* "No" button */
tdbuttons[tdconfig.cButtons++] = tdb_no; tdbuttons[tdconfig.cButtons++] = tdb_no;
else else
tdconfig.dwCommonButtons |= TDCBF_NO_BUTTON; tdconfig.dwCommonButtons |= (flags & MBX_QUESTION_OK) ? TDCBF_CANCEL_BUTTON : TDCBF_NO_BUTTON;
if (flags & MBX_QUESTION) { if (flags & MBX_QUESTION) {
if (btn3) /* "Cancel" button */ if (btn3) /* "Cancel" button */

5
src/win/win_settings.c
View File

@@ -531,7 +531,10 @@ settings_msgbox_reset(int button)
h = hwndMain; h = hwndMain;
hwndMain = hwndParentDialog; hwndMain = hwndParentDialog;
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); if (button)
i = ui_msgbox_ex(MBX_QUESTION_OK | MBX_WARNING, (wchar_t *) IDS_2051, (wchar_t *) IDS_2142, (wchar_t *) IDS_2140, NULL, NULL);
else
i = ui_msgbox_ex(MBX_QUESTION | MBX_LINKS, (wchar_t *) IDS_2123, NULL, (wchar_t *) IDS_2121, (wchar_t *) IDS_2122, NULL);
hwndMain = h; hwndMain = h;