Merged all the latest and missed 86box commits.

Finally fixed the configuration UI of the FDC's.
This commit is contained in:
TC1995
2020-06-17 14:29:24 +02:00
parent 90d1ddac52
commit b97b9ae2f9
12 changed files with 183 additions and 201 deletions

View File

@@ -554,9 +554,9 @@ BEGIN
PUSHBUTTON "Configure",IDC_CONFIGURE_ISAMEM_4,217,171,38,12
LTEXT "FDC Controller:",IDT_1768,7,190,48,10
COMBOBOX IDC_COMBO_FDC_EXT,64,189,155,120,CBS_DROPDOWNLIST |
COMBOBOX IDC_COMBO_FDC,64,189,155,120,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Configure",IDC_CONFIGURE_FDC_EXT,217,189,38,12
PUSHBUTTON "Configure",IDC_CONFIGURE_FDC,217,189,38,12
END
DLG_CFG_HARD_DISKS DIALOG DISCARDABLE 97, 0, 267, 154
@@ -968,6 +968,7 @@ BEGIN
IDS_2115 "MO %i (%03i): %ls"
IDS_2116 "MO images (*.IM?)\0*.IM?\0All files (*.*)\0*.*\0"
IDS_2117 "Welcome to 86Box!"
IDS_2118 "Internal controller"
END
STRINGTABLE DISCARDABLE