diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index a74b5b7f6..82cfde082 100644 --- a/src/include/86box/resource.h +++ b/src/include/86box/resource.h @@ -113,47 +113,48 @@ #define IDT_CHANNEL 1741 /* Channel: */ #define IDT_ID 1742 /* ID: */ #define IDT_LUN 1743 /* LUN: */ +#define IDT_SPEED 1744 /* Speed: */ /* DLG_CFG_HARD_DISKS_ADD */ -#define IDT_SECTORS 1744 /* Sectors: */ -#define IDT_HEADS 1745 /* Heads: */ -#define IDT_CYLS 1746 /* Cylinders: */ -#define IDT_SIZE_MB 1747 /* Size (MB): */ -#define IDT_TYPE 1748 /* Type: */ -#define IDT_FILE_NAME 1749 /* File name: */ -#define IDT_IMG_FORMAT 1750 /* Image Format: */ -#define IDT_BLOCK_SIZE 1751 /* Block Size: */ -#define IDT_PROGRESS 1752 /* Progress: */ +#define IDT_SECTORS 1745 /* Sectors: */ +#define IDT_HEADS 1746 /* Heads: */ +#define IDT_CYLS 1747 /* Cylinders: */ +#define IDT_SIZE_MB 1748 /* Size (MB): */ +#define IDT_TYPE 1749 /* Type: */ +#define IDT_FILE_NAME 1750 /* File name: */ +#define IDT_IMG_FORMAT 1751 /* Image Format: */ +#define IDT_BLOCK_SIZE 1752 /* Block Size: */ +#define IDT_PROGRESS 1753 /* Progress: */ /* DLG_CFG_FLOPPY_AND_CDROM_DRIVES */ -#define IDT_FLOPPY_DRIVES 1753 /* Floppy drives: */ -#define IDT_FDD_TYPE 1754 /* Type: */ -#define IDT_CD_DRIVES 1755 /* CD-ROM drives: */ -#define IDT_CD_BUS 1756 /* Bus: */ -#define IDT_CD_ID 1757 /* ID: */ -#define IDT_CD_LUN 1758 /* LUN: */ -#define IDT_CD_CHANNEL 1759 /* Channel: */ -#define IDT_CD_SPEED 1760 /* Speed: */ +#define IDT_FLOPPY_DRIVES 1754 /* Floppy drives: */ +#define IDT_FDD_TYPE 1755 /* Type: */ +#define IDT_CD_DRIVES 1756 /* CD-ROM drives: */ +#define IDT_CD_BUS 1757 /* Bus: */ +#define IDT_CD_ID 1758 /* ID: */ +#define IDT_CD_LUN 1759 /* LUN: */ +#define IDT_CD_CHANNEL 1760 /* Channel: */ +#define IDT_CD_SPEED 1761 /* Speed: */ /* DLG_CFG_OTHER_REMOVABLE_DEVICES */ -#define IDT_MO_DRIVES 1761 /* MO drives: */ -#define IDT_MO_BUS 1762 /* Bus: */ -#define IDT_MO_ID 1763 /* ID: */ -#define IDT_MO_CHANNEL 1764 /* Channel */ -#define IDT_MO_TYPE 1765 /* Type: */ +#define IDT_MO_DRIVES 1762 /* MO drives: */ +#define IDT_MO_BUS 1763 /* Bus: */ +#define IDT_MO_ID 1764 /* ID: */ +#define IDT_MO_CHANNEL 1765 /* Channel */ +#define IDT_MO_TYPE 1766 /* Type: */ -#define IDT_ZIP_DRIVES 1766 /* ZIP drives: */ -#define IDT_ZIP_BUS 1767 /* Bus: */ -#define IDT_ZIP_ID 1768 /* ID: */ -#define IDT_ZIP_LUN 1769 /* LUN: */ -#define IDT_ZIP_CHANNEL 1770 /* Channel: */ +#define IDT_ZIP_DRIVES 1767 /* ZIP drives: */ +#define IDT_ZIP_BUS 1768 /* Bus: */ +#define IDT_ZIP_ID 1769 /* ID: */ +#define IDT_ZIP_LUN 1770 /* LUN: */ +#define IDT_ZIP_CHANNEL 1771 /* Channel: */ /* DLG_CFG_PERIPHERALS */ -#define IDT_ISARTC 1771 /* ISA RTC: */ -#define IDT_ISAMEM_1 1772 /* ISAMEM Board #1: */ -#define IDT_ISAMEM_2 1773 /* ISAMEM Board #2: */ -#define IDT_ISAMEM_3 1774 /* ISAMEM Board #3: */ -#define IDT_ISAMEM_4 1775 /* ISAMEM Board #4: */ +#define IDT_ISARTC 1772 /* ISA RTC: */ +#define IDT_ISAMEM_1 1773 /* ISAMEM Board #1: */ +#define IDT_ISAMEM_2 1774 /* ISAMEM Board #2: */ +#define IDT_ISAMEM_3 1775 /* ISAMEM Board #3: */ +#define IDT_ISAMEM_4 1776 /* ISAMEM Board #4: */ /* * To try to keep these organized, we now group the diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index 11571a297..9b49fc01d 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Sběrnice:" #define STR_CHANNEL "Kanál:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Zadat..." #define STR_SECTORS "Sektory:" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index 575f96466..74199b6da 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Bus:" #define STR_CHANNEL "Kanal:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Festlegen..." #define STR_SECTORS "Sektoren:" diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index eeb24c03f..dc0ec3627 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Bus:" #define STR_CHANNEL "Channel:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Specify..." #define STR_SECTORS "Sectors:" diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index 1203bf17b..d166b1d0c 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Bus:" #define STR_CHANNEL "Channel:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Specify..." #define STR_SECTORS "Sectors:" diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index fa0ba4471..faba0638c 100644 --- a/src/win/languages/es-ES.rc +++ b/src/win/languages/es-ES.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Bus:" #define STR_CHANNEL "Canal:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "E&specificar..." #define STR_SECTORS "Sectores:" diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index 8a025b089..127508bdd 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Väylä:" #define STR_CHANNEL "Kanava:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Määritä..." #define STR_SECTORS "Sektorit:" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index de2884806..c7cdf65d7 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Bus:" #define STR_CHANNEL "Canal:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Spécifier..." #define STR_SECTORS "Secteurs:" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index ba5fc9287..f2952bbcf 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Sabirnica:" #define STR_CHANNEL "Kanal:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Odredi..." #define STR_SECTORS "Sektori:" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index bde1d8eca..0ffa215c0 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -340,6 +340,7 @@ END #define STR_BUS "Busz:" #define STR_CHANNEL "Csatorna:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Kiválasztás..." #define STR_SECTORS "Szektor:" diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index eac20756d..960e9e205 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -336,6 +336,7 @@ END #define STR_BUS "Bus:" #define STR_CHANNEL "Canale:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Specifica..." #define STR_SECTORS "Settori:" @@ -425,8 +426,8 @@ BEGIN IDS_2084 "H" IDS_2085 "S" IDS_2086 "MB" - IDS_2088 "Verifica BPB" IDS_2087 "Speed" + IDS_2088 "Verifica BPB" IDS_2089 "KB" IDS_2090 "Impossibile inizializzare il renderer video." IDS_2091 "Predefinito" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index 958c5dac2..edcf3f668 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -335,6 +335,7 @@ END #define STR_BUS "バス:" #define STR_CHANNEL "チャンネル:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "参照(&S)..." #define STR_SECTORS "セクター:" diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc index ad2950cdd..a5f0cfe57 100644 --- a/src/win/languages/ko-KR.rc +++ b/src/win/languages/ko-KR.rc @@ -335,6 +335,7 @@ END #define STR_BUS "버스:" #define STR_CHANNEL "채널:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "열기(&S)..." #define STR_SECTORS "섹터:" diff --git a/src/win/languages/pl-PL.rc b/src/win/languages/pl-PL.rc index 235451887..ec59c5ef1 100644 --- a/src/win/languages/pl-PL.rc +++ b/src/win/languages/pl-PL.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Magistrala:" #define STR_CHANNEL "Kanał:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Określ..." #define STR_SECTORS "Sektory:" diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 550d45df1..541bd2ca1 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -338,6 +338,7 @@ END #define STR_BUS "Bar.:" #define STR_CHANNEL "Canal:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Especificar..." #define STR_SECTORS "Setores:" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index 28785a394..704262b3d 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Barram.:" #define STR_CHANNEL "Canal:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Especificar..." #define STR_SECTORS "Sectores:" diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index 819f0a4a6..667cfafa6 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Шина:" #define STR_CHANNEL "Канал:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Указать..." #define STR_SECTORS "Сектора:" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index 56c1acf69..3bdf357f4 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Vodilo:" #define STR_CHANNEL "Kanal:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "Določi..." #define STR_SECTORS "Sektorji:" diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index 23221751a..858bf0a01 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Veri yolu:" #define STR_CHANNEL "Kanal:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Belirle..." #define STR_SECTORS "Sektörler:" diff --git a/src/win/languages/uk-UA.rc b/src/win/languages/uk-UA.rc index d01bbdcc6..9f7f92cbe 100644 --- a/src/win/languages/uk-UA.rc +++ b/src/win/languages/uk-UA.rc @@ -335,6 +335,7 @@ END #define STR_BUS "Шина:" #define STR_CHANNEL "Канал:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "&Вказати..." #define STR_SECTORS "Сектора:" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 51d055e2a..88a7e9055 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -335,6 +335,7 @@ END #define STR_BUS "总线:" #define STR_CHANNEL "通道:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "指定(&S)..." #define STR_SECTORS "扇区(S):" diff --git a/src/win/languages/zh-TW.rc b/src/win/languages/zh-TW.rc index 4b5d39493..60aee7244 100644 --- a/src/win/languages/zh-TW.rc +++ b/src/win/languages/zh-TW.rc @@ -335,6 +335,7 @@ END #define STR_BUS "匯流排:" #define STR_CHANNEL "通道:" #define STR_ID "ID:" +#define STR_SPEED "Speed:" #define STR_SPECIFY "指定(&S)..." #define STR_SECTORS "磁區(S):" diff --git a/src/win/win_preferences.c b/src/win/win_preferences.c index 880701165..4ac7f7f75 100644 --- a/src/win/win_preferences.c +++ b/src/win/win_preferences.c @@ -1,17 +1,17 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Handle the dialog for changing the program's language and other global settings. + * Handle the dialog for changing the program's language and other global settings. * * - * Authors: Laci bá' + * Authors: Laci bá' * - * Copyright 2021 Laci bá' + * Copyright 2021 Laci bá' */ #define UNICODE #define BITMAP WINDOWS_BITMAP diff --git a/src/win/win_settings.c b/src/win/win_settings.c index fc15a809c..f7462a00c 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -1,22 +1,22 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Windows 86Box Settings dialog handler. + * Windows 86Box Settings dialog handler. * * * - * Authors: Miran Grca, - * David Hrdlička, + * Authors: Miran Grca, + * David Hrdlička, * - * Copyright 2016-2019 Miran Grca. - * Copyright 2018,2019 David Hrdlička. - * Copyright 2021 Laci bá' - * Copyright 2021-2022 Jasmine Iwanek. + * Copyright 2016-2019 Miran Grca. + * Copyright 2018,2019 David Hrdlička. + * Copyright 2021 Laci bá' + * Copyright 2021-2022 Jasmine Iwanek. */ #define UNICODE #define BITMAP WINDOWS_BITMAP @@ -74,7 +74,7 @@ #include "../disk/minivhd/minivhd.h" #include "../disk/minivhd/minivhd_util.h" -/* Icon, Bus, File, C, H, S, Size */ +/* Icon, Bus, File, C, H, S, Size, Speed */ #define C_COLUMNS_HARD_DISKS 7 static int first_cat = 0; @@ -1037,7 +1037,7 @@ generate_device_name(const device_t *device, char *internal_name, int bus) if (!strcmp(internal_name, "none")) { /* Translate "None". */ - wtemp = (WCHAR *) win_get_string(IDS_2103); + wtemp = (WCHAR *) win_get_string(IDS_2104); memcpy(device_name, wtemp, (wcslen(wtemp) + 1) * sizeof(WCHAR)); return; } else if (!strcmp(internal_name, "internal")) @@ -1077,9 +1077,9 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (video_card_available(c) && device_is_valid(video_card_getdevice(c), temp_machine)) { if (c == 0) // "None" - settings_add_string(hdlg, IDC_COMBO_VIDEO, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_VIDEO, win_get_string(IDS_2104)); else if (c == 1) // "Internal" - settings_add_string(hdlg, IDC_COMBO_VIDEO, win_get_string(IDS_2118)); + settings_add_string(hdlg, IDC_COMBO_VIDEO, win_get_string(IDS_2119)); else settings_add_string(hdlg, IDC_COMBO_VIDEO, (LPARAM) device_name); settings_list_to_device[0][d] = c; @@ -1117,9 +1117,9 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) device_is_valid(video_card_getdevice(c), temp_machine) && !(video_card_get_flags(c) == video_card_get_flags(gfxcard))) { if (c == 0) // "None" - settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2104)); else if (c == 1) // "Internal" - settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2118)); + settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2119)); else settings_add_string(hdlg, IDC_COMBO_VIDEO_2, (LPARAM) device_name); settings_list_to_device[1][d] = c; @@ -1244,9 +1244,9 @@ win_settings_input_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (mouse_valid(c, temp_machine)) { generate_device_name(mouse_get_device(c), mouse_get_internal_name(c), 0); if (c == 0) - settings_add_string(hdlg, IDC_COMBO_MOUSE, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_MOUSE, win_get_string(IDS_2104)); else if (c == 1) - settings_add_string(hdlg, IDC_COMBO_MOUSE, win_get_string(IDS_2118)); + settings_add_string(hdlg, IDC_COMBO_MOUSE, win_get_string(IDS_2119)); else settings_add_string(hdlg, IDC_COMBO_MOUSE, (LPARAM) device_name); settings_list_to_device[0][d] = c; @@ -1373,9 +1373,9 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (device_is_valid(sound_dev, temp_machine)) { if (c == 0) - settings_add_string(hdlg, IDC_COMBO_SOUND, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_SOUND, win_get_string(IDS_2104)); else if (c == 1) - settings_add_string(hdlg, IDC_COMBO_SOUND, win_get_string(IDS_2118)); + settings_add_string(hdlg, IDC_COMBO_SOUND, win_get_string(IDS_2119)); else settings_add_string(hdlg, IDC_COMBO_SOUND, (LPARAM) device_name); settings_list_to_device[0][d] = c; @@ -1401,7 +1401,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (midi_out_device_available(c)) { if (c == 0) - settings_add_string(hdlg, IDC_COMBO_MIDI_OUT, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_MIDI_OUT, win_get_string(IDS_2104)); else settings_add_string(hdlg, IDC_COMBO_MIDI_OUT, (LPARAM) device_name); settings_list_to_midi[d] = c; @@ -1425,7 +1425,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (midi_in_device_available(c)) { if (c == 0) - settings_add_string(hdlg, IDC_COMBO_MIDI_IN, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_MIDI_IN, win_get_string(IDS_2104)); else settings_add_string(hdlg, IDC_COMBO_MIDI_IN, (LPARAM) device_name); settings_list_to_midi_in[d] = c; @@ -1586,7 +1586,7 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) break; if (c == 0) - settings_add_string(hdlg, IDC_COMBO_LPT1 + i, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_LPT1 + i, win_get_string(IDS_2104)); else { mbstowcs(lptsTemp, s, strlen(s) + 1); settings_add_string(hdlg, IDC_COMBO_LPT1 + i, (LPARAM) lptsTemp); @@ -1674,9 +1674,9 @@ win_settings_storage_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (device_is_valid(hdc_dev, temp_machine)) { if (c == 0) - settings_add_string(hdlg, IDC_COMBO_HDC, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_HDC, win_get_string(IDS_2104)); else if (c == 1) - settings_add_string(hdlg, IDC_COMBO_HDC, win_get_string(IDS_2118)); + settings_add_string(hdlg, IDC_COMBO_HDC, win_get_string(IDS_2119)); else settings_add_string(hdlg, IDC_COMBO_HDC, (LPARAM) device_name); settings_list_to_hdc[d] = c; @@ -1706,7 +1706,7 @@ win_settings_storage_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (device_is_valid(fdc_dev, temp_machine)) { if (c == 0) - settings_add_string(hdlg, IDC_COMBO_FDC, win_get_string(IDS_2118)); + settings_add_string(hdlg, IDC_COMBO_FDC, win_get_string(IDS_2119)); else settings_add_string(hdlg, IDC_COMBO_FDC, (LPARAM) device_name); settings_list_to_fdc[d] = c; @@ -1738,7 +1738,7 @@ win_settings_storage_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (device_is_valid(scsi_dev, temp_machine)) { for (e = 0; e < SCSI_BUS_MAX; e++) { if (c == 0) - settings_add_string(hdlg, IDC_COMBO_SCSI_1 + e, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_SCSI_1 + e, win_get_string(IDS_2104)); else settings_add_string(hdlg, IDC_COMBO_SCSI_1 + e, (LPARAM) device_name); @@ -1891,7 +1891,7 @@ win_settings_network_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (network_card_available(c) && device_is_valid(network_card_getdevice(c), temp_machine)) { if (c == 0) - settings_add_string(hdlg, IDC_COMBO_NET, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_NET, win_get_string(IDS_2104)); else settings_add_string(hdlg, IDC_COMBO_NET, (LPARAM) device_name); settings_list_to_device[0][d] = c; @@ -2214,7 +2214,7 @@ win_settings_hard_disks_update_item(HWND hdlg, int i, int column) lvI.iSubItem = column; lvI.iItem = i; - if (column == 0) { + if (column == 0) { /* Bus */ switch (temp_hdd[i].bus) { case HDD_BUS_MFM: wsprintf(szText, plat_get_string(IDS_4608), temp_hdd[i].mfm_channel >> 1, temp_hdd[i].mfm_channel & 1); @@ -2237,29 +2237,33 @@ win_settings_hard_disks_update_item(HWND hdlg, int i, int column) } lvI.pszText = szText; lvI.iImage = 0; - } else if (column == 1) { + } else if (column == 1) { /* File */ if (!strnicmp(temp_hdd[i].fn, usr_path, strlen(usr_path))) mbstoc16s(szText, temp_hdd[i].fn + strlen(usr_path), sizeof_w(szText)); else mbstoc16s(szText, temp_hdd[i].fn, sizeof_w(szText)); lvI.pszText = szText; lvI.iImage = 0; - } else if (column == 2) { + } else if (column == 2) { /* Cylinders */ wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].tracks); lvI.pszText = szText; lvI.iImage = 0; - } else if (column == 3) { + } else if (column == 3) { /* Heads */ wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].hpc); lvI.pszText = szText; lvI.iImage = 0; - } else if (column == 4) { + } else if (column == 4) { /* Sectors */ wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].spt); lvI.pszText = szText; lvI.iImage = 0; - } else if (column == 5) { + } else if (column == 5) { /* Size (MB) */ wsprintf(szText, plat_get_string(IDS_4098), (temp_hdd[i].tracks * temp_hdd[i].hpc * temp_hdd[i].spt) >> 11); lvI.pszText = szText; lvI.iImage = 0; + } else if (column == 6) { /* Speed (RPM) */ + mbstoc16s(szText, hdd_preset_getname(temp_hdd[i].speed_preset), sizeof_w(szText)); + lvI.pszText = szText; + lvI.iImage = 0; } if (ListView_SetItem(hwndList, &lvI) == -1) @@ -2288,6 +2292,8 @@ win_settings_hard_disks_recalc_list(HWND hdlg) if (temp_hdd[i].bus > 0) { hdc_id_to_listview_index[i] = j; lvI.iSubItem = 0; + + /* Bus */ switch (temp_hdd[i].bus) { case HDD_BUS_MFM: wsprintf(szText, plat_get_string(IDS_4608), temp_hdd[i].mfm_channel >> 1, temp_hdd[i].mfm_channel & 1); @@ -2315,6 +2321,7 @@ win_settings_hard_disks_recalc_list(HWND hdlg) if (ListView_InsertItem(hwndList, &lvI) == -1) return FALSE; + /* File */ lvI.iSubItem = 1; if (!strnicmp(temp_hdd[i].fn, usr_path, strlen(usr_path))) mbstoc16s(szText, temp_hdd[i].fn + strlen(usr_path), sizeof_w(szText)); @@ -2325,6 +2332,7 @@ win_settings_hard_disks_recalc_list(HWND hdlg) if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE; + /* Cylinders */ lvI.iSubItem = 2; wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].tracks); lvI.pszText = szText; @@ -2332,6 +2340,7 @@ win_settings_hard_disks_recalc_list(HWND hdlg) if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE; + /* Heads */ lvI.iSubItem = 3; wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].hpc); lvI.pszText = szText; @@ -2339,6 +2348,7 @@ win_settings_hard_disks_recalc_list(HWND hdlg) if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE; + /* Sectors */ lvI.iSubItem = 4; wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].spt); lvI.pszText = szText; @@ -2346,10 +2356,19 @@ win_settings_hard_disks_recalc_list(HWND hdlg) if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE; + /* Size (MB) */ lvI.iSubItem = 5; wsprintf(szText, plat_get_string(IDS_4098), (temp_hdd[i].tracks * temp_hdd[i].hpc * temp_hdd[i].spt) >> 11); lvI.pszText = szText; + if (ListView_SetItem(hwndList, &lvI) == -1) + return FALSE; + + /* Speed (RPM) */ + lvI.iSubItem = 6; + mbstoc16s(szText, hdd_preset_getname(temp_hdd[i].speed_preset), sizeof_w(szText)); + lvI.pszText = szText; + if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE; @@ -2364,12 +2383,12 @@ win_settings_hard_disks_recalc_list(HWND hdlg) } #define C_COLUMNS_HARD_DISKS_BUS 104 -#define C_COLUMNS_HARD_DISKS_FILE 354 +#define C_COLUMNS_HARD_DISKS_FILE 254 #define C_COLUMNS_HARD_DISKS_CYLS 50 #define C_COLUMNS_HARD_DISKS_HEADS 26 #define C_COLUMNS_HARD_DISKS_SECT 32 #define C_COLUMNS_HARD_DISKS_SIZE 50 -#define C_COLUMNS_HARD_DISKS_SPEED 50 +#define C_COLUMNS_HARD_DISKS_SPEED 100 static void win_settings_hard_disks_resize_columns(HWND hdlg) @@ -2377,12 +2396,12 @@ win_settings_hard_disks_resize_columns(HWND hdlg) /* Bus, File, Cylinders, Heads, Sectors, Size */ int iCol, width[C_COLUMNS_HARD_DISKS] = { C_COLUMNS_HARD_DISKS_BUS, - C_COLUMNS_HARD_DISKS_FILE, - C_COLUMNS_HARD_DISKS_CYLS, - C_COLUMNS_HARD_DISKS_HEADS, - C_COLUMNS_HARD_DISKS_SECT, - C_COLUMNS_HARD_DISKS_SIZE, - C_COLUMNS_HARD_DISKS_SPEED + C_COLUMNS_HARD_DISKS_FILE, + C_COLUMNS_HARD_DISKS_CYLS, + C_COLUMNS_HARD_DISKS_HEADS, + C_COLUMNS_HARD_DISKS_SECT, + C_COLUMNS_HARD_DISKS_SIZE, + C_COLUMNS_HARD_DISKS_SPEED }; int total = 0; HWND hwndList = GetDlgItem(hdlg, IDC_LIST_HARD_DISKS); @@ -2428,11 +2447,11 @@ win_settings_hard_disks_init_columns(HWND hdlg) lvc.cx = C_COLUMNS_HARD_DISKS_HEADS; lvc.fmt = LVCFMT_RIGHT; break; - case 4: /* Sectors */ + case 4: /* Sectors */ lvc.cx = C_COLUMNS_HARD_DISKS_SECT; lvc.fmt = LVCFMT_RIGHT; break; - case 5: /* Size (MB) 8 */ + case 5: /* Size (MB) */ lvc.cx = C_COLUMNS_HARD_DISKS_SIZE; lvc.fmt = LVCFMT_RIGHT; break; @@ -2470,7 +2489,7 @@ set_edit_box_contents(HWND hdlg, int id, uint32_t val) WCHAR szText[256]; h = GetDlgItem(hdlg, id); - wsprintf(szText, plat_get_string(IDS_2106), val); + wsprintf(szText, plat_get_string(IDS_2107), val); SendMessage(h, WM_SETTEXT, (WPARAM) wcslen(szText), (LPARAM) szText); } @@ -2501,7 +2520,7 @@ hdconf_initialize_hdt_combo(HWND hdlg) for (i = 0; i < 127; i++) { temp_size = ((uint64_t) hdd_table[i][0]) * hdd_table[i][1] * hdd_table[i][2]; size_mb = (uint32_t) (temp_size >> 11LL); - wsprintf(szText, plat_get_string(IDS_2107), size_mb, hdd_table[i][0], hdd_table[i][1], hdd_table[i][2]); + wsprintf(szText, plat_get_string(IDS_2108), size_mb, hdd_table[i][0], hdd_table[i][1], hdd_table[i][2]); settings_add_string(hdlg, IDC_COMBO_HD_TYPE, (LPARAM) szText); if ((tracks == (int) hdd_table[i][0]) && (hpc == (int) hdd_table[i][1]) && (spt == (int) hdd_table[i][2])) selection = i; @@ -2804,7 +2823,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM /* Make sure no file name is allowed with removable SCSI hard disks. */ if (wcslen(hd_file_name) == 0) { hdd_ptr->bus = HDD_BUS_DISABLED; - settings_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2130, (wchar_t *) IDS_4112); + settings_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2131, (wchar_t *) IDS_4112); return TRUE; } @@ -3702,7 +3721,7 @@ win_settings_cdrom_drives_recalc_list(HWND hdlg) lvI.iSubItem = 1; if (temp_cdrom[i].bus_type == CDROM_BUS_DISABLED) - lvI.pszText = plat_get_string(IDS_2103); + lvI.pszText = plat_get_string(IDS_2104); else { wsprintf(szText, L"%ix", temp_cdrom[i].speed); lvI.pszText = szText; @@ -3766,7 +3785,7 @@ win_settings_mo_drives_recalc_list(HWND hdlg) lvI.iSubItem = 1; if (temp_mo_drives[i].bus_type == MO_BUS_DISABLED) - lvI.pszText = plat_get_string(IDS_2103); + lvI.pszText = plat_get_string(IDS_2104); else { memset(szType, 0, 30); memcpy(szType, mo_drive_types[temp_mo_drives[i].type].vendor, 8); @@ -3940,7 +3959,7 @@ win_settings_cdrom_drives_init_columns(HWND hdlg) return FALSE; lvc.iSubItem = 2; - lvc.pszText = plat_get_string(IDS_2161); + lvc.pszText = plat_get_string(IDS_2162); lvc.cx = 89; lvc.fmt = LVCFMT_LEFT; @@ -4139,7 +4158,7 @@ win_settings_cdrom_drives_update_item(HWND hdlg, int i) lvI.iSubItem = 1; if (temp_cdrom[i].bus_type == CDROM_BUS_DISABLED) - lvI.pszText = plat_get_string(IDS_2103); + lvI.pszText = plat_get_string(IDS_2104); else { wsprintf(szText, L"%ix", temp_cdrom[i].speed); lvI.pszText = szText; @@ -4199,7 +4218,7 @@ win_settings_mo_drives_update_item(HWND hdlg, int i) lvI.iSubItem = 1; if (temp_mo_drives[i].bus_type == MO_BUS_DISABLED) - lvI.pszText = plat_get_string(IDS_2103); + lvI.pszText = plat_get_string(IDS_2104); else { memset(szType, 0, 30); memcpy(szType, mo_drive_types[temp_mo_drives[i].type].vendor, 8); @@ -4978,7 +4997,7 @@ win_settings_peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lPa dev = isartc_get_device(d); if (device_is_valid(dev, temp_machine)) { if (d == 0) { - settings_add_string(hdlg, IDC_COMBO_ISARTC, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_ISARTC, win_get_string(IDS_2104)); settings_set_cur_sel(hdlg, IDC_COMBO_ISARTC, 0); } else settings_add_string(hdlg, IDC_COMBO_ISARTC, (LPARAM) device_name); @@ -5004,7 +5023,7 @@ win_settings_peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lPa dev = isamem_get_device(d); if (device_is_valid(dev, temp_machine)) { if (d == 0) { - settings_add_string(hdlg, IDC_COMBO_ISAMEM_1 + c, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_ISAMEM_1 + c, win_get_string(IDS_2104)); settings_set_cur_sel(hdlg, IDC_COMBO_ISAMEM_1 + c, 0); } else settings_add_string(hdlg, IDC_COMBO_ISAMEM_1 + c, (LPARAM) device_name); @@ -5160,7 +5179,7 @@ win_settings_confirm(HWND hdlg) if (win_settings_changed()) { if (confirm_save && !settings_only) - i = settings_msgbox_ex(MBX_QUESTION_OK | MBX_WARNING | MBX_DONTASK, (wchar_t *) IDS_2121, (wchar_t *) IDS_2122, (wchar_t *) IDS_2123, NULL, NULL); + i = settings_msgbox_ex(MBX_QUESTION_OK | MBX_WARNING | MBX_DONTASK, (wchar_t *) IDS_2122, (wchar_t *) IDS_2123, (wchar_t *) IDS_2124, NULL, NULL); else i = 0; diff --git a/src/win/win_ui.c b/src/win/win_ui.c index 0e700ed04..b93ae0d57 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -1,23 +1,23 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * user Interface module for WinAPI on Windows. + * user Interface module for WinAPI on Windows. * * * - * Authors: Sarah Walker, - * Miran Grca, - * Fred N. van Kempen, + * Authors: Sarah Walker, + * Miran Grca, + * Fred N. van Kempen, * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2016-2020 Miran Grca. - * Copyright 2017-2020 Fred N. van Kempen. - * Copyright 2019,2020 GH Cao. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2020 Miran Grca. + * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2019,2020 GH Cao. */ #include #define UNICODE