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

Correct win32 ui for cdrom model headings

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-05-04 02:53:49 -04:00
parent 5c0292ae41
commit 1c3e1b4602
24 changed files with 44 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/include/86box/resource.h
View File

@@ -142,26 +142,27 @@
#define IDT_CD_LUN 1766 /* LUN: */
#define IDT_CD_CHANNEL 1767 /* Channel: */
#define IDT_CD_SPEED 1768 /* Speed: */
#define IDT_CD_TYPE 1769 /* Type: */
/* DLG_CFG_OTHER_REMOVABLE_DEVICES */
#define IDT_MO_DRIVES 1769 /* MO drives: */
#define IDT_MO_BUS 1770 /* Bus: */
#define IDT_MO_ID 1771 /* ID: */
#define IDT_MO_CHANNEL 1772 /* Channel */
#define IDT_MO_TYPE 1773 /* Type: */
#define IDT_MO_DRIVES 1770 /* MO drives: */
#define IDT_MO_BUS 1771 /* Bus: */
#define IDT_MO_ID 1772 /* ID: */
#define IDT_MO_CHANNEL 1773 /* Channel */
#define IDT_MO_TYPE 1774 /* Type: */
#define IDT_ZIP_DRIVES 1774 /* ZIP drives: */
#define IDT_ZIP_BUS 1775 /* Bus: */
#define IDT_ZIP_ID 1776 /* ID: */
#define IDT_ZIP_LUN 1777 /* LUN: */
#define IDT_ZIP_CHANNEL 1778 /* Channel: */
#define IDT_ZIP_DRIVES 1775 /* ZIP drives: */
#define IDT_ZIP_BUS 1776 /* Bus: */
#define IDT_ZIP_ID 1777 /* ID: */
#define IDT_ZIP_LUN 1778 /* LUN: */
#define IDT_ZIP_CHANNEL 1779 /* Channel: */
/* DLG_CFG_PERIPHERALS */
#define IDT_ISARTC 1779 /* ISA RTC: */
#define IDT_ISAMEM_1 1780 /* ISAMEM Board #1: */
#define IDT_ISAMEM_2 1781 /* ISAMEM Board #2: */
#define IDT_ISAMEM_3 1782 /* ISAMEM Board #3: */
#define IDT_ISAMEM_4 1783 /* ISAMEM Board #4: */
#define IDT_ISARTC 1780 /* ISA RTC: */
#define IDT_ISAMEM_1 1781 /* ISAMEM Board #1: */
#define IDT_ISAMEM_2 1782 /* ISAMEM Board #2: */
#define IDT_ISAMEM_3 1783 /* ISAMEM Board #3: */
#define IDT_ISAMEM_4 1784 /* ISAMEM Board #4: */
/*
* To try to keep these organized, we now group the
@@ -302,7 +303,7 @@
#define IDC_COMBO_CD_ID 1157
#define IDC_COMBO_CD_LUN 1158
#define IDC_COMBO_CD_CHANNEL_IDE 1159
//#define IDC_CHECKEARLY 1160
#define IDC_COMBO_CD_TYPE 1160
#define IDC_LIST_ZIP_DRIVES 1170 /* other removable devices config */
#define IDC_COMBO_ZIP_BUS 1171

3
src/win/languages/cs-CZ.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Kontrola BPB"
#define STR_CDROM_DRIVES "Mechaniky CD-ROM:"
#define STR_CD_SPEED "Rychlost:"
#define STR_EARLY "Časná mechanika"
#define STR_MO_DRIVES "Magnetooptické mechaniky:"
#define STR_ZIP_DRIVES "Mechaniky ZIP:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Resetovat"
IDS_2160 "Vypnout skrze rozhraní ACPI"
IDS_2161 "Nastavení"
IDS_2162 "Časná mechanika"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/de-DE.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "BPB überprüfen"
#define STR_CDROM_DRIVES "CD-ROM-Laufwerke:"
#define STR_CD_SPEED "Geschwindigkeit:"
#define STR_EARLY "Früheres Laufwerk"
#define STR_MO_DRIVES "MO-Laufwerke:"
#define STR_ZIP_DRIVES "ZIP-Laufwerke:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Hard-Reset"
IDS_2160 "ACPI-basiertes Herunterfahren"
IDS_2161 "Optionen"
IDS_2162 "Früheres Laufwerk"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

9
src/win/languages/dialogs.rc
View File

@@ -833,11 +833,12 @@ BEGIN
COMBOBOX IDC_COMBO_CD_SPEED,
33, 205, 140, 12,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
/*
CONTROL STR_EARLY, IDC_CHECKEARLY,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
186, 206, 84, CFG_CHECKBOX_HEIGHT
LTEXT STR_TYPE, IDT_CD_TYPE,
CFG_HMARGIN, 233, 34, CFG_PANE_LTEXT_HEIGHT
COMBOBOX IDC_COMBO_CD_SPEED,
33, 231, 140, 12,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
*/
END

3
src/win/languages/en-GB.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Check BPB"
#define STR_CDROM_DRIVES "CD-ROM drives:"
#define STR_CD_SPEED "Speed:"
#define STR_EARLY "Earlier drive"
#define STR_MO_DRIVES "MO drives:"
#define STR_ZIP_DRIVES "ZIP drives:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Hard reset"
IDS_2160 "ACPI shutdown"
IDS_2161 "Settings"
IDS_2162 "Earlier drive"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/en-US.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Check BPB"
#define STR_CDROM_DRIVES "CD-ROM drives:"
#define STR_CD_SPEED "Speed:"
#define STR_EARLY "Earlier drive"
#define STR_MO_DRIVES "MO drives:"
#define STR_ZIP_DRIVES "ZIP drives:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Hard reset"
IDS_2160 "ACPI shutdown"
IDS_2161 "Settings"
IDS_2162 "Earlier drive"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/es-ES.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Chequear BPB"
#define STR_CDROM_DRIVES "Unidades de CD-ROM:"
#define STR_CD_SPEED "Velocidad:"
#define STR_EARLY "Unidad anterior"
#define STR_MO_DRIVES "Unidades MO:"
#define STR_ZIP_DRIVES "Unidades ZIP:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Hard reset"
IDS_2160 "ACPI shutdown"
IDS_2161 "Settings"
IDS_2162 "Unidad anterior"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/fi-FI.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Tarkista BPB"
#define STR_CDROM_DRIVES "CD-ROM-asemat:"
#define STR_CD_SPEED "Nopeus:"
#define STR_EARLY "Aiemmat asemat"
#define STR_MO_DRIVES "Magneettisoptiset asemat (MO):"
#define STR_ZIP_DRIVES "ZIP-asemat:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Kylmä uudelleenkäynnistys"
IDS_2160 "ACPI-sammutus"
IDS_2161 "Asetukset"
IDS_2162 "Aiemmat asemat"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/fr-FR.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Vérifier BPB"
#define STR_CDROM_DRIVES "Lecterus CD-ROM:"
#define STR_CD_SPEED "Vitesse:"
#define STR_EARLY "Lecteur plus tôt"
#define STR_MO_DRIVES "Lecteurs magnéto-optiques:"
#define STR_ZIP_DRIVES "Lecteurs ZIP:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Hard reset"
IDS_2160 "ACPI shutdown"
IDS_2161 "Settings"
IDS_2162 "Lecteur plus tôt"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/hr-HR.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Provjeraj BPB"
#define STR_CDROM_DRIVES "CD-ROM pogoni:"
#define STR_CD_SPEED "Brzina:"
#define STR_EARLY "Raniji pogon"
#define STR_MO_DRIVES "MO pogoni:"
#define STR_ZIP_DRIVES "ZIP pogoni:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Ponovno pokretanje"
IDS_2160 "ACPI bazirano gašenje"
IDS_2161 "Postavke"
IDS_2162 "Raniji pogon"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/hu-HU.rc
View File

@@ -373,7 +373,6 @@ END
#define STR_CHECKBPB "BPB ellenőrzés"
#define STR_CDROM_DRIVES "CD-ROM meghajtók:"
#define STR_CD_SPEED "Seb.:"
#define STR_EARLY "Korábbi meghajtó"
#define STR_MO_DRIVES "MO-meghajtók:"
#define STR_ZIP_DRIVES "ZIP-meghajtók:"
@@ -542,7 +541,7 @@ BEGIN
IDS_2159 "Hard reset"
IDS_2160 "ACPI shutdown"
IDS_2161 "Settings"
IDS_2162 "Korábbi meghajtó"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/it-IT.rc
View File

@@ -369,7 +369,6 @@ END
#define STR_CHECKBPB "Verifica BPB"
#define STR_CDROM_DRIVES "Unità CD-ROM:"
#define STR_CD_SPEED "Veloc.:"
#define STR_EARLY "Unità anteriore"
#define STR_MO_DRIVES "Unità magneto-ottiche:"
#define STR_ZIP_DRIVES "Unità ZIP:"
@@ -539,7 +538,7 @@ BEGIN
IDS_2159 "Hard reset"
IDS_2160 "ACPI shutdown"
IDS_2161 "Settings"
IDS_2162 "Unità anteriore"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/ja-JP.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "BPBをチェック"
#define STR_CDROM_DRIVES "CD-ROMドライブ:"
#define STR_CD_SPEED "速度:"
#define STR_EARLY "アーリードライブ"
#define STR_MO_DRIVES "光磁気ドライブ:"
#define STR_ZIP_DRIVES "ZIPドライブ:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "ハードリセット"
IDS_2160 "ACPIシャットダウン"
IDS_2161 "設定"
IDS_2162 "アーリードライブ"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/ko-KR.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "BPB 확인"
#define STR_CDROM_DRIVES "CD-ROM 드라이브:"
#define STR_CD_SPEED "속도:"
#define STR_EARLY "이전 드라이브"
#define STR_MO_DRIVES "광자기 드라이브:"
#define STR_ZIP_DRIVES "ZIP 드라이브:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "재시작"
IDS_2160 "ACPI 종료"
IDS_2161 "설정"
IDS_2162 "이전 드라이브"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/pl-PL.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Sprawdzaj BPB"
#define STR_CDROM_DRIVES "Napędy CD-ROM:"
#define STR_CD_SPEED "Szybkość:"
#define STR_EARLY "Wcześniejszy napęd"
#define STR_MO_DRIVES "Napędy MO:"
#define STR_ZIP_DRIVES "Napędy ZIP:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Twardy reset"
IDS_2160 "Wyłączenie ACPI"
IDS_2161 "Ustawienia"
IDS_2162 "Wcześniejszy napęd"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/pt-BR.rc
View File

@@ -371,7 +371,6 @@ END
#define STR_CHECKBPB "Verificar BPB"
#define STR_CDROM_DRIVES "Unidades de CD-ROM:"
#define STR_CD_SPEED "Veloc.:"
#define STR_EARLY "Unidade anterior"
#define STR_MO_DRIVES "Unidades magneto-ópticas:"
#define STR_ZIP_DRIVES "Unidades ZIP:"
@@ -541,7 +540,7 @@ BEGIN
IDS_2159 "Reinicialização completa"
IDS_2160 "Desligamento por ACPI"
IDS_2161 "Configurações"
IDS_2162 "Unidade anterior"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/pt-PT.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Verificar BPB"
#define STR_CDROM_DRIVES "Unidades CD-ROM:"
#define STR_CD_SPEED "Velocidade:"
#define STR_EARLY "Unidade anterior"
#define STR_MO_DRIVES "Unidades magneto-ópticas:"
#define STR_ZIP_DRIVES "Unidades ZIP:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Reinicialização completa"
IDS_2160 "Encerramento ACPI"
IDS_2161 "Definições"
IDS_2162 "Unidade anterior"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/ru-RU.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Проверять BPB"
#define STR_CDROM_DRIVES "Дисководы CD-ROM:"
#define STR_CD_SPEED "Скорость:"
#define STR_EARLY "Предыдущий дисковод"
#define STR_MO_DRIVES "Магнитооптические дисководы:"
#define STR_ZIP_DRIVES "ZIP дисководы:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Холодная перезагрузка"
IDS_2160 "Сигнал завершения ACPI"
IDS_2161 "Настройки машины"
IDS_2162 "Предыдущий дисковод"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/sl-SI.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Preverjaj BPB"
#define STR_CDROM_DRIVES "Pogoni CD-ROM:"
#define STR_CD_SPEED "Hitrost:"
#define STR_EARLY "Zgodnejši pogon"
#define STR_MO_DRIVES "Magnetno-optični pogoni:"
#define STR_ZIP_DRIVES "Pogoni ZIP:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Ponovni zagon"
IDS_2160 "Zaustavitev ACPI"
IDS_2161 "Nastavitve"
IDS_2162 "Zgodnejši pogon"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/tr-TR.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "BPB'yi denetle"
#define STR_CDROM_DRIVES "CD-ROM sürücüleri:"
#define STR_CD_SPEED "Hız:"
#define STR_EARLY "Daha erken sürüş"
#define STR_MO_DRIVES "MO sürücüleri:"
#define STR_ZIP_DRIVES "ZIP sürücüleri:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Makineyi yeniden başlat"
IDS_2160 "ACPI kapatma"
IDS_2161 "Ayarlar"
IDS_2162 "Daha erken sürüş"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/uk-UA.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "Перевіряти BPB"
#define STR_CDROM_DRIVES "Дисководи CD-ROM:"
#define STR_CD_SPEED "Швидкість:"
#define STR_EARLY "Більш ранній дисковод"
#define STR_MO_DRIVES "Магнітооптичні дисководи:"
#define STR_ZIP_DRIVES "ZIP дисководи:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "Холодне перезавантаження"
IDS_2160 "Сигнал завершення ACPI"
IDS_2161 "Налаштування машини"
IDS_2162 "Більш ранній дисковод"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/zh-CN.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "检查 BPB"
#define STR_CDROM_DRIVES "光盘驱动器:"
#define STR_CD_SPEED "速度:"
#define STR_EARLY "早先的驱动器"
#define STR_MO_DRIVES "磁光盘驱动器:"
#define STR_ZIP_DRIVES "ZIP 驱动器:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "硬重置"
IDS_2160 "ACPI 关机"
IDS_2161 "设置"
IDS_2162 "早先的驱动器"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

3
src/win/languages/zh-TW.rc
View File

@@ -368,7 +368,6 @@ END
#define STR_CHECKBPB "檢查 BPB"
#define STR_CDROM_DRIVES "光碟機:"
#define STR_CD_SPEED "速度:"
#define STR_EARLY "早先的光碟機"
#define STR_MO_DRIVES "磁光碟機:"
#define STR_ZIP_DRIVES "ZIP 磁碟機:"
@@ -538,7 +537,7 @@ BEGIN
IDS_2159 "硬重設"
IDS_2160 "ACPI 關機"
IDS_2161 "設定"
IDS_2162 "早先的光碟機"
IDS_2162 "Type"
IDS_2163 "No Dynarec"
IDS_2164 "Old Dynarec"
IDS_2165 "New Dynarec"

2
src/win/win_settings.c
View File

@@ -4263,7 +4263,7 @@ win_settings_cdrom_drives_init_columns(HWND hdlg)
if (ListView_InsertColumn(hwndList, 1, &lvc) == -1)
return FALSE;
/* Earlier drive */
/* Type */
lvc.iSubItem = 2;
lvc.pszText = plat_get_string(IDS_2162);