claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the bus location controls in the Settings and Add Hard Disk dialogs.

Browse Source
This commit is contained in:
OBattler
2017-06-16 03:40:18 +02:00
parent 8dcc7176a9
commit 657f633edb
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/WIN/86Box.rc
View File

@@ -384,7 +384,6 @@ BEGIN
LTEXT "LUN:",IDT_1724,200,118,38,8
COMBOBOX IDC_COMBO_HD_CHANNEL_IDE,170,117,90,12,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
LTEXT "Channel:",IDT_1725,131,118,38,8
END
DLG_CFG_HARD_DISKS_ADD DIALOG DISCARDABLE 0, 0, 219, 111
@@ -410,19 +409,18 @@ BEGIN
LTEXT "File name:",IDT_1731,7,7,204,9
COMBOBOX IDC_COMBO_HD_BUS,33,71,58,12,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
LTEXT "Bus:",IDT_1732,7,72,24,8
LTEXT "Bus:",IDT_1721,7,72,24,8
COMBOBOX IDC_COMBO_HD_CHANNEL,134,71,77,12,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
LTEXT "Channel:",IDT_1733,99,72,34,8
LTEXT "Channel:",IDT_1722,99,72,34,8
COMBOBOX IDC_COMBO_HD_ID,133,71,26,12,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
LTEXT "ID:",IDT_1734,117,72,15,8
LTEXT "ID:",IDT_1723,117,72,15,8
COMBOBOX IDC_COMBO_HD_LUN,185,71,26,12,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
LTEXT "LUN:",IDT_1735,168,72,15,8
LTEXT "LUN:",IDT_1724,168,72,15,8
COMBOBOX IDC_COMBO_HD_CHANNEL_IDE,134,71,77,12,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
LTEXT "Channel:",IDT_1736,99,72,34,8
END
/* Static text label IDs. */

28
src/WIN/win_settings.c
View File

@@ -1860,7 +1860,7 @@ static void recalc_location_controls(HWND hdlg, int is_add_dlg)
int bus = 0;
for (i = 1799; i < 1803; i++)
for (i = IDT_1722; i < IDT_1725; i++)
{
h = GetDlgItem(hdlg, i);
EnableWindow(h, FALSE);
@@ -1892,7 +1892,7 @@ static void recalc_location_controls(HWND hdlg, int is_add_dlg)
switch(bus)
{
case HDD_BUS_MFM: /* MFM */
h = GetDlgItem(hdlg, 1799);
h = GetDlgItem(hdlg, IDT_1722);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
@@ -1902,7 +1902,7 @@ static void recalc_location_controls(HWND hdlg, int is_add_dlg)
SendMessage(h, CB_SETCURSEL, is_add_dlg ? new_hdc.mfm_channel : temp_hdc[hdlv_current_sel].mfm_channel, 0);
break;
case HDD_BUS_RLL: /* RLL */
h = GetDlgItem(hdlg, 1799);
h = GetDlgItem(hdlg, IDT_1722);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
@@ -1912,7 +1912,7 @@ static void recalc_location_controls(HWND hdlg, int is_add_dlg)
SendMessage(h, CB_SETCURSEL, is_add_dlg ? new_hdc.rll_channel : temp_hdc[hdlv_current_sel].rll_channel, 0);
break;
case HDD_BUS_XTIDE: /* XT IDE */
h = GetDlgItem(hdlg, 1799);
h = GetDlgItem(hdlg, IDT_1722);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
@@ -1923,7 +1923,7 @@ static void recalc_location_controls(HWND hdlg, int is_add_dlg)
break;
case HDD_BUS_IDE_PIO_ONLY: /* IDE (PIO-only) */
case HDD_BUS_IDE_PIO_AND_DMA: /* IDE (PIO and DMA) */
h = GetDlgItem(hdlg, 1802);
h = GetDlgItem(hdlg, IDT_1722);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
@@ -1934,10 +1934,10 @@ static void recalc_location_controls(HWND hdlg, int is_add_dlg)
break;
case HDD_BUS_SCSI: /* SCSI */
case HDD_BUS_SCSI_REMOVABLE: /* SCSI (removable) */
h = GetDlgItem(hdlg, 1800);
h = GetDlgItem(hdlg, IDT_1723);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
h = GetDlgItem(hdlg, 1801);
h = GetDlgItem(hdlg, IDT_1724);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
@@ -1956,7 +1956,7 @@ static void recalc_location_controls(HWND hdlg, int is_add_dlg)
if ((hd_listview_items == 0) && !is_add_dlg)
{
h = GetDlgItem(hdlg, 1798);
h = GetDlgItem(hdlg, IDT_1721);
EnableWindow(h, FALSE);
ShowWindow(h, SW_HIDE);
@@ -1965,7 +1965,7 @@ static void recalc_location_controls(HWND hdlg, int is_add_dlg)
}
else
{
h = GetDlgItem(hdlg, 1798);
h = GetDlgItem(hdlg, IDT_1721);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
@@ -3758,7 +3758,7 @@ static void cdrom_recalc_location_controls(HWND hdlg)
int bus = temp_cdrom_drives[cdlv_current_sel].bus_type;
for (i = 1800; i < 1803; i++)
for (i = IDT_1741; i < (IDT_1743 + 1); i++)
{
h = GetDlgItem(hdlg, i);
EnableWindow(h, FALSE);
@@ -3779,9 +3779,9 @@ static void cdrom_recalc_location_controls(HWND hdlg)
switch(bus)
{
case CDROM_BUS_ATAPI_PIO_ONLY: /* ATAPI (PIO-only) */
case CDROM_BUS_ATAPI_PIO_ONLY: /* ATAPI (PIO-only) */
case CDROM_BUS_ATAPI_PIO_AND_DMA: /* ATAPI (PIO and DMA) */
h = GetDlgItem(hdlg, 1802);
h = GetDlgItem(hdlg, IDT_1743);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
@@ -3791,14 +3791,14 @@ static void cdrom_recalc_location_controls(HWND hdlg)
SendMessage(h, CB_SETCURSEL, temp_cdrom_drives[cdlv_current_sel].ide_channel, 0);
break;
case CDROM_BUS_SCSI: /* SCSI */
h = GetDlgItem(hdlg, 1800);
h = GetDlgItem(hdlg, IDT_1741);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
h = GetDlgItem(hdlg, 1801);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
h = GetDlgItem(hdlg, IDC_COMBO_CD_ID);
h = GetDlgItem(hdlg, IDT_1742);
ShowWindow(h, SW_SHOW);
EnableWindow(h, TRUE);
SendMessage(h, CB_SETCURSEL, temp_cdrom_drives[cdlv_current_sel].scsi_device_id, 0);