diff --git a/src/ICONS/hard_disk_removable_scsi.ico b/src/ICONS/hard_disk_removable_scsi.ico new file mode 100644 index 000000000..59f80a96b Binary files /dev/null and b/src/ICONS/hard_disk_removable_scsi.ico differ diff --git a/src/ICONS/hard_disk_removable_scsi_active.ico b/src/ICONS/hard_disk_removable_scsi_active.ico new file mode 100644 index 000000000..de2979539 Binary files /dev/null and b/src/ICONS/hard_disk_removable_scsi_active.ico differ diff --git a/src/ICONS/hard_disk_removable_scsi_empty.ico b/src/ICONS/hard_disk_removable_scsi_empty.ico new file mode 100644 index 000000000..be5da8ee4 Binary files /dev/null and b/src/ICONS/hard_disk_removable_scsi_empty.ico differ diff --git a/src/ICONS/hard_disk_removable_scsi_empty_active.ico b/src/ICONS/hard_disk_removable_scsi_empty_active.ico new file mode 100644 index 000000000..8c08338ba Binary files /dev/null and b/src/ICONS/hard_disk_removable_scsi_empty_active.ico differ diff --git a/src/WIN/86Box.rc b/src/WIN/86Box.rc index a593212e4..7c8395647 100644 --- a/src/WIN/86Box.rc +++ b/src/WIN/86Box.rc @@ -664,6 +664,8 @@ END 163 ICON DISCARDABLE "ICONS/cdrom_atapi_dma_active.ico" 164 ICON DISCARDABLE "ICONS/cdrom_scsi.ico" 165 ICON DISCARDABLE "ICONS/cdrom_scsi_active.ico" +176 ICON DISCARDABLE "ICONS/hard_disk_removable_scsi.ico" +177 ICON DISCARDABLE "ICONS/hard_disk_removable_scsi_active.ico" 192 ICON DISCARDABLE "ICONS/hard_disk_mfm.ico" 193 ICON DISCARDABLE "ICONS/hard_disk_mfm_active.ico" 194 ICON DISCARDABLE "ICONS/hard_disk.ico" @@ -702,6 +704,8 @@ END 419 ICON DISCARDABLE "ICONS/cdrom_atapi_dma_empty_active.ico" 420 ICON DISCARDABLE "ICONS/cdrom_scsi_empty.ico" 421 ICON DISCARDABLE "ICONS/cdrom_scsi_empty_active.ico" +432 ICON DISCARDABLE "ICONS/hard_disk_removable_scsi_empty.ico" +433 ICON DISCARDABLE "ICONS/hard_disk_removable_scsi_empty_active.ico" 512 ICON DISCARDABLE "ICONS/floppy_disabled.ico" 514 ICON DISCARDABLE "ICONS/cdrom_disabled.ico" @@ -1003,7 +1007,9 @@ BEGIN 2198 "Removable disk %i: %s" 2199 "USB is not yet supported" 2200 "Invalid PCap device" - 2201 "English (United States)" + 2201 "SCSI removable disk: %ws" + 2202 "" + 2203 "English (United States)" END diff --git a/src/WIN/win.c b/src/WIN/win.c index 010b67f61..af72b0ef1 100644 --- a/src/WIN/win.c +++ b/src/WIN/win.c @@ -809,6 +809,23 @@ void create_cdrom_tip(int part) } } +void create_removable_hd_tip(int part) +{ + WCHAR *szText; + WCHAR wtext[512]; + + int drive = sb_part_meanings[part] & 0xf; + + if (wcslen(hdd_fn[drive]) == 0) + { + _swprintf(sbTips[part], win_language_get_string_from_id(2201), win_language_get_string_from_id(2185)); + } + else + { + _swprintf(sbTips[part], win_language_get_string_from_id(2179), hdd_fn[drive]); + } +} + void create_hd_tip(int part) { WCHAR *szText; @@ -841,11 +858,9 @@ void update_tip(int meaning) case 0x10: create_cdrom_tip(part); break; -#if 0 case 0x20: create_removable_hd_tip(part); break; -#endif case 0x30: create_hd_tip(part); break; @@ -954,7 +969,6 @@ void update_status_bar_panes(HWND hwnds) sb_parts++; } } -#if 0 for (i = 0; i < 16; i++) { if (hdc[i].bus == 5) @@ -965,7 +979,6 @@ void update_status_bar_panes(HWND hwnds) sb_parts++; } } -#endif if (c_mfm && !(models[model].flags & MODEL_HAS_IDE) && !!memcmp(hdd_controller_name, "none", 4) && !!memcmp(hdd_controller_name, "xtide", 5)) { edge += sb_icon_width; @@ -1047,14 +1060,12 @@ void update_status_bar_panes(HWND hwnds) sb_part_icons[i] = j | sb_icon_flags[i]; create_cdrom_tip(i); break; -#if 0 case 0x20: /* Removable hard disk */ sb_icon_flags[i] = (wcslen(discfns[sb_part_meanings[i] & 0xf]) == 0) ? 256 : 0; sb_part_icons[i] = 176 + sb_icon_flags[i]; - create_floppy_tip(i); + create_removable_hd_tip(i); break; -#endif case 0x30: /* Hard disk */ sb_part_icons[i] = 192 + ((sb_part_meanings[i] & 0xf) << 1); @@ -1107,12 +1118,10 @@ HWND EmulatorStatusBar(HWND hwndParent, int idStatus, HINSTANCE hinst) hIcon[i] = LoadIconEx((PCTSTR) i); } -#if 0 for (i = 176; i < 178; i++) { hIcon[i] = LoadIconEx((PCTSTR) i); } -#endif for (i = 192; i < 200; i++) { @@ -1139,12 +1148,10 @@ HWND EmulatorStatusBar(HWND hwndParent, int idStatus, HINSTANCE hinst) hIcon[i] = LoadIconEx((PCTSTR) i); } -#if 0 for (i = 432; i < 434; i++) { hIcon[i] = LoadIconEx((PCTSTR) i); } -#endif GetWindowRect(hwndParent, &rectDialog); dw = rectDialog.right - rectDialog.left;