80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Improve reset and exit confirmations

Browse Source
This commit is contained in:
RichardG867
2020-06-19 00:26:13 -03:00
parent 09083aa98a
commit a44c2c2fe1
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,6 +109,9 @@
#define IDS_2133 2133 // LIB_NAME_FLUIDSYNTH " is required..." #define IDS_2133 2133 // LIB_NAME_FLUIDSYNTH " is required..."
#define IDS_2134 2134 // "Entering fullscreen mode" #define IDS_2134 2134 // "Entering fullscreen mode"
#define IDS_2135 2135 // "Don't show this message again" #define IDS_2135 2135 // "Don't show this message again"
#define IDS_2136 2136 // "Don't Exit"
#define IDS_2137 2137 // "Reset"
#define IDS_2138 2138 // "Don't Reset"
#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"
@@ -135,7 +138,7 @@
#define IDS_4118 4118 // "The selected file will be..." #define IDS_4118 4118 // "The selected file will be..."
#define IDS_4119 4119 // "Unsupported disk image" #define IDS_4119 4119 // "Unsupported disk image"
#define IDS_4120 4120 // "Overwrite" #define IDS_4120 4120 // "Overwrite"
#define IDS_4121 4121 // "Cancel" #define IDS_4121 4121 // "Don't Overwrite"
#define IDS_4352 4352 // "MFM/RLL" #define IDS_4352 4352 // "MFM/RLL"
#define IDS_4353 4353 // "XT IDE" #define IDS_4353 4353 // "XT IDE"

7
src/win/86Box.rc
View File

@@ -950,7 +950,7 @@ BEGIN
IDS_2110 "Unable to initialize FreeType" IDS_2110 "Unable to initialize FreeType"
IDS_2111 "Unable to initialize SDL, SDL2.dll is required" IDS_2111 "Unable to initialize SDL, SDL2.dll is required"
IDS_2112 "Are you sure you want to hard reset the emulated machine?" IDS_2112 "Are you sure you want to hard reset the emulated machine?"
IDS_2113 "Are you sure you want to quit 86Box?" IDS_2113 "Are you sure you want to exit " EMU_NAME "?"
IDS_2114 "Unable to initialize Ghostscript" IDS_2114 "Unable to initialize Ghostscript"
IDS_2115 "MO %i (%03i): %ls" IDS_2115 "MO %i (%03i): %ls"
IDS_2116 "MO images (*.IM?)\0*.IM?\0All files (*.*)\0*.*\0" IDS_2116 "MO images (*.IM?)\0*.IM?\0All files (*.*)\0*.*\0"
@@ -993,6 +993,9 @@ BEGIN
IDS_2133 LIB_NAME_FLUIDSYNTH " is required for FluidSynth MIDI output." IDS_2133 LIB_NAME_FLUIDSYNTH " is required for FluidSynth MIDI output."
IDS_2134 "Entering fullscreen mode" IDS_2134 "Entering fullscreen mode"
IDS_2135 "Don't show this message again" IDS_2135 "Don't show this message again"
IDS_2136 "Don't Exit"
IDS_2137 "Reset"
IDS_2138 "Don't Reset"
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
@@ -1022,7 +1025,7 @@ BEGIN
IDS_4118 "The selected file will be overwritten. Are you sure you want to use it?" IDS_4118 "The selected file will be overwritten. Are you sure you want to use it?"
IDS_4119 "Unsupported disk image" IDS_4119 "Unsupported disk image"
IDS_4120 "Overwrite" IDS_4120 "Overwrite"
IDS_4121 "Cancel" IDS_4121 "Don't Overwrite"
IDS_4352 "MFM/RLL" IDS_4352 "MFM/RLL"
IDS_4353 "XTA" IDS_4353 "XTA"

10
src/win/win_ui.c
View File

@@ -312,7 +312,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
case IDM_ACTION_HRESET: case IDM_ACTION_HRESET:
win_notify_dlg_open(); win_notify_dlg_open();
i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2112); i = ui_msgbox_ex(MBX_QUESTION_YN, (wchar_t *) IDS_2112, NULL, (wchar_t *) IDS_2137, (wchar_t *) IDS_2138, NULL);
if (i == 0) if (i == 0)
pc_reset_hard(); pc_reset_hard();
win_notify_dlg_closed(); win_notify_dlg_closed();
@@ -327,7 +327,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
if (no_quit_confirm) if (no_quit_confirm)
i = 0; i = 0;
else else
i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2113); i = ui_msgbox_ex(MBX_QUESTION_YN, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL);
if (i == 0) { if (i == 0) {
UnhookWindowsHookEx(hKeyboardHook); UnhookWindowsHookEx(hKeyboardHook);
KillTimer(hwnd, TIMER_1SEC); KillTimer(hwnd, TIMER_1SEC);
@@ -695,7 +695,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
if (no_quit_confirm) if (no_quit_confirm)
i = 0; i = 0;
else else
i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2113); i = ui_msgbox_ex(MBX_QUESTION_YN, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL);
if (i == 0) { if (i == 0) {
UnhookWindowsHookEx(hKeyboardHook); UnhookWindowsHookEx(hKeyboardHook);
KillTimer(hwnd, TIMER_1SEC); KillTimer(hwnd, TIMER_1SEC);
@@ -731,7 +731,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
if (manager_wm) if (manager_wm)
break; break;
win_notify_dlg_open(); win_notify_dlg_open();
i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2112); i = ui_msgbox_ex(MBX_QUESTION_YN, (wchar_t *) IDS_2112, NULL, (wchar_t *) IDS_2137, (wchar_t *) IDS_2138, NULL);
if (i == 0) if (i == 0)
pc_reset_hard(); pc_reset_hard();
win_notify_dlg_closed(); win_notify_dlg_closed();
@@ -744,7 +744,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
if (no_quit_confirm) if (no_quit_confirm)
i = 0; i = 0;
else else
i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2113); i = ui_msgbox_ex(MBX_QUESTION_YN, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL);
if (i == 0) { if (i == 0) {
UnhookWindowsHookEx(hKeyboardHook); UnhookWindowsHookEx(hKeyboardHook);
KillTimer(hwnd, TIMER_1SEC); KillTimer(hwnd, TIMER_1SEC);