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

Use string resources instead of hard-coded strings.

Browse Source
This commit is contained in:
Stephen McKinney
2020-11-19 01:11:52 -06:00
parent 617b44d54f
commit 84df433c6a
3 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,6 +146,13 @@
#define IDS_4125 4125 // "Fixed-size VHD (.vhd)" #define IDS_4125 4125 // "Fixed-size VHD (.vhd)"
#define IDS_4126 4126 // "Dynamic-size VHD (.vhd)" #define IDS_4126 4126 // "Dynamic-size VHD (.vhd)"
#define IDS_4127 4127 // "Differencing VHD (.vhd)" #define IDS_4127 4127 // "Differencing VHD (.vhd)"
#define IDS_4128 4128 // "Large blocks (2 MB)"
#define IDS_4129 4129 // "Small blocks (512 KB)"
#define IDS_4130 4130 // "VHD files (*.VHD)\0*.VHD\0All files (*.*)\0*.*\0"
#define IDS_4131 4131 // "Select the parent VHD"
#define IDS_4132 4132 // "WARNING: VHD PARENT/CHILD TIMESTAMPS DO NOT MATCH..."
#define IDS_4133 4133 // "VHD Timestamp Mismatch"
#define IDS_4134 4134 // "Could not fix VHD timestamp."
#define IDS_4352 4352 // "MFM/RLL" #define IDS_4352 4352 // "MFM/RLL"
#define IDS_4353 4353 // "XT IDE" #define IDS_4353 4353 // "XT IDE"
@@ -215,7 +222,7 @@
#define STR_NUM_2048 92 #define STR_NUM_2048 92
#define STR_NUM_3072 11 #define STR_NUM_3072 11
#define STR_NUM_4096 32 #define STR_NUM_4096 39
#define STR_NUM_4352 6 #define STR_NUM_4352 6
#define STR_NUM_4608 6 #define STR_NUM_4608 6
#define STR_NUM_5120 1 #define STR_NUM_5120 1

19
src/win/86Box.rc
View File

@@ -1061,12 +1061,19 @@ BEGIN
IDS_4119 "Unsupported disk image" IDS_4119 "Unsupported disk image"
IDS_4120 "Overwrite" IDS_4120 "Overwrite"
IDS_4121 "Don't Overwrite" IDS_4121 "Don't Overwrite"
IDS_4122 "Raw image (.img)" IDS_4122 "Raw image (.img)"
IDS_4123 "HDI image (.hdi)" IDS_4123 "HDI image (.hdi)"
IDS_4124 "HDX image (.hdx)" IDS_4124 "HDX image (.hdx)"
IDS_4125 "Fixed-size VHD (.vhd)" IDS_4125 "Fixed-size VHD (.vhd)"
IDS_4126 "Dynamic-size VHD (.vhd)" IDS_4126 "Dynamic-size VHD (.vhd)"
IDS_4127 "Differencing VHD (.vhd)" IDS_4127 "Differencing VHD (.vhd)"
IDS_4128 "Large blocks (2 MB)"
IDS_4129 "Small blocks (512 KB)"
IDS_4130 "VHD files (*.VHD)\0*.VHD\0All files (*.*)\0*.*\0"
IDS_4131 "Select the parent VHD"
IDS_4132 "WARNING: VHD PARENT/CHILD TIMESTAMPS DO NOT MATCH!\n\nThis could indicate that the parent image was modified after this VHD was created.\n\nThis could also happen if the VHD files were moved/copied, or the differencing VHD was created with DiskPart.\n\nDo you wish to fix this error after a file copy or DiskPart creation?"
IDS_4133 "VHD Timestamp Mismatch"
IDS_4134 "Could not fix VHD timestamp."
IDS_4352 "MFM/RLL" IDS_4352 "MFM/RLL"
IDS_4353 "XTA" IDS_4353 "XTA"

39
src/win/win_settings.c
View File

@@ -2591,25 +2591,17 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
size = (tracks * hpc * spt) << 9; size = (tracks * hpc * spt) << 9;
set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20LL)); set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20LL));
hdconf_initialize_hdt_combo(hdlg); hdconf_initialize_hdt_combo(hdlg);
// TODO: Why is it crashing when I try to use string resources here? settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4122));
// settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4122)); settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4123));
// settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4123)); settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4124));
// settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4124)); settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4125));
// settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4125)); settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4126));
// settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4126)); settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4127));
// settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4127));
settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, (LPARAM) L"Raw image (.img)");
settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, (LPARAM) L"HDI image (.hdi)");
settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, (LPARAM) L"HDX image (.hdx)");
settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, (LPARAM) L"Fixed-size VHD (.vhd)");
settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, (LPARAM) L"Dynamic-size VHD (.vhd)");
settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, (LPARAM) L"Differencing VHD (.vhd)");
settings_set_cur_sel(hdlg, IDC_COMBO_HD_IMG_FORMAT, 0); settings_set_cur_sel(hdlg, IDC_COMBO_HD_IMG_FORMAT, 0);
settings_add_string(hdlg, IDC_COMBO_HD_BLOCK_SIZE, (LPARAM) L"Large blocks (2 MB)"); settings_add_string(hdlg, IDC_COMBO_HD_BLOCK_SIZE, win_get_string(IDS_4128));
settings_add_string(hdlg, IDC_COMBO_HD_BLOCK_SIZE, (LPARAM) L"Small blocks (512 KB)"); settings_add_string(hdlg, IDC_COMBO_HD_BLOCK_SIZE, win_get_string(IDS_4129));
settings_set_cur_sel(hdlg, IDC_COMBO_HD_BLOCK_SIZE, 0); settings_set_cur_sel(hdlg, IDC_COMBO_HD_BLOCK_SIZE, 0);
settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, FALSE); settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, FALSE);
@@ -2767,7 +2759,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
_86box_geometry = create_drive_vhd_dynamic(hd_file_name_multibyte, tracks, hpc, spt, block_size); _86box_geometry = create_drive_vhd_dynamic(hd_file_name_multibyte, tracks, hpc, spt, block_size);
break; break;
case 5: case 5:
if (file_dlg_w(hdlg, L"VHD files (*.VHD)\0*.VHD\0All files (*.*)\0*.*\0", L"", L"Select the parent VHD",0)) { if (file_dlg_w(hdlg, plat_get_string(IDS_4130), L"", plat_get_string(IDS_4131), 0)) {
return TRUE; return TRUE;
} }
_86box_geometry = create_drive_vhd_diff(hd_file_name_multibyte, openfilestring, block_size); _86box_geometry = create_drive_vhd_diff(hd_file_name_multibyte, openfilestring, block_size);
@@ -2887,16 +2879,11 @@ hdd_add_file_open_error:
if (vhd == NULL) { if (vhd == NULL) {
settings_msgbox_header(MBX_ERROR, (existing & 1) ? (wchar_t *) IDS_4114 : (wchar_t *) IDS_4115, (existing & 1) ? (wchar_t *) IDS_4107 : (wchar_t *) IDS_4108); settings_msgbox_header(MBX_ERROR, (existing & 1) ? (wchar_t *) IDS_4114 : (wchar_t *) IDS_4115, (existing & 1) ? (wchar_t *) IDS_4107 : (wchar_t *) IDS_4108);
return TRUE; return TRUE;
} else if (vhd_error == MVHD_ERR_TIMESTAMP) { } else if (vhd_error == MVHD_ERR_TIMESTAMP) {
wchar_t* ts_warning = if (settings_msgbox_ex(MBX_QUESTION_YN, plat_get_string(IDS_4133), plat_get_string(IDS_4132), NULL, NULL, NULL) != 0) {
L"WARNING: VHD PARENT/CHILD TIMESTAMPS DO NOT MATCH!\n\n"
"This could indicate that the parent image was modified after this VHD was created.\n\n"
"This could also happen if the VHD files were moved/copied, or the differencing VHD was created with DiskPart.\n\n"
"Do you wish to fix this error after a file copy or DiskPart creation?";
if (settings_msgbox_ex(MBX_QUESTION_YN, L"VHD Timestamp Mismatch", ts_warning, NULL, NULL, NULL) != 0) {
int ts_res = mvhd_diff_update_par_timestamp(vhd, &vhd_error); int ts_res = mvhd_diff_update_par_timestamp(vhd, &vhd_error);
if (ts_res != 0) { if (ts_res != 0) {
settings_msgbox_header(MBX_ERROR, L"Error", L"Could not fix VHD timestamp."); settings_msgbox_header(MBX_ERROR, plat_get_string(IDS_2049), plat_get_string(IDS_4134));
mvhd_close(vhd); mvhd_close(vhd);
return TRUE; return TRUE;
} }