From e8d047d0d0c6ec50e327897deb86b38d724129cf Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 21 May 2017 03:52:18 +0200 Subject: [PATCH] The icons and status bar handling code for the SCSI removable hard disks is now there. --- src/ICONS/hard_disk_removable_scsi.ico | Bin 0 -> 1150 bytes src/ICONS/hard_disk_removable_scsi_active.ico | Bin 0 -> 1150 bytes src/ICONS/hard_disk_removable_scsi_empty.ico | Bin 0 -> 1150 bytes .../hard_disk_removable_scsi_empty_active.ico | Bin 0 -> 1150 bytes src/WIN/86Box.rc | 8 ++++- src/WIN/win.c | 29 +++++++++++------- 6 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 src/ICONS/hard_disk_removable_scsi.ico create mode 100644 src/ICONS/hard_disk_removable_scsi_active.ico create mode 100644 src/ICONS/hard_disk_removable_scsi_empty.ico create mode 100644 src/ICONS/hard_disk_removable_scsi_empty_active.ico diff --git a/src/ICONS/hard_disk_removable_scsi.ico b/src/ICONS/hard_disk_removable_scsi.ico new file mode 100644 index 0000000000000000000000000000000000000000..59f80a96b3fd5aedcc1df78d25bed544c4c0381b GIT binary patch literal 1150 zcmZQzU}Ruq5D);-3Je)63=Con3=A3!3=9Gc3=9ek5OD?&U}0c5Ci^Z*)Bm4nssDF%@%(=veK(gZ1dCmnIrabL>68Co znmY0S#mW8uFHGqDf4;Bl|M{Md|L3~e{-5n=`G2mr1FZH$YvaG$8`k~#aQoJO1itzI z{Vfo_@&EnJ8~@+mxc>j$^=tp%UAy}K-POzg-(I=&|Lx_A|KD7?@c+ufdH*iWn{)Eo zg1P^%%$fQB%A6SxJZt*@%QL6`zcgdY|4U%EO!|Kj=AKD?|1V7J1>+Mf^=G!HC1u=Q zw;JN!iM{{N_jdk2+u8d6bZg`PlZ`e1Pt;cYKUP`t|43=U|3ig2{}1J7fiXyKLuf$8 ze0zI=YfBb>yABH9xwHO*{C{c6g#YLJyTSeio6}J9|9DOL|D)wa|Bn>sf$_1rsxON@ z%=kcQ@KkTtvOB9+{0ErG+qQt?`1<_W|F6!P_W#nfN&hcQ==p!Hr{n*bwx<85nrh*GIos3me}$`q zHApWA*E29MU7kPZ;f;m!z;3vP#~&cOPqsH*1?fY^dkS-kuPs>!N>Bf;AhvAvy(F??AHu|7TzTVM1)*qk>vl0a}#}zHPxNJG<(M1i?gQvy)a|S z-}BQZ{XIWr!rya~`u?8n@A-SCxASk_iab=kP;)XDrv16HVD7(%TQ~iGuzAD(dmGpN zzq@|T|2u0|{=c(o`TtwXm;ArEbkYChZOQ+WpVnfUu`T)k)rIr^J>0hW|AVcY{y*Hl z1x(*ZGplHA(f{NJ<^PlKm7{0EUz$4c z|HaAu|1V7F{l9KX-G8wEZxtZ)A4&edvZwst?G5Yxe7JqHja!ocjOLj4A&wf!#9c|3#R4CiVTlFtHbmPqfsZ*`Ah^ad+Knh;KcOjsH(J*8D$FTk-!`Wy${|r3L>F73Taul%EC0Ah`{p0U7h{?FFtaS@`Yxg1P^% z&7B4I|D`Dt{-5vf{(r8k4Ps71&Hv*y<^PYC7yUm{oCn6o>Z-mh_AuiErJ+;3UCZvQ zUhyAf#??79z~OgsQXj-E9WDP)H`o6^QD61{SXC+59VhB4|L-f#n-9_p!mB*pTpw)P z^8dzyx&N=vpZ)*ptZDx*O`G)p!i1jx=XyH+pJ{9Qf2ye#?w7MY9sgIjI#`4Bf^a

6P-|Y#}Dad*UlKuZ61H=CY!Y*iFWMBYeW(I}>%nS_w H|3feUz^f{N literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..be5da8ee4a94b4bb6005429db3d1ab80fc52d914 GIT binary patch literal 1150 zcmZQzU}Ruq5D);-3Je)63=Con3=A3!3=9Gc3=9ek5OD?&U}0c5CbY`}+LZzpu}o`TP3p>A$beocjCf)XBduPagmK^2D*fFODDm`{L-~zt4{x z`uqIwfxpiW@BjN~+vbyRuUz`~`QF|CpYGoI|MAZ4{~vGP`v2k9jsG8RUjP5$`nCV> zuU-BB{_5rb@2_0?|L*dI|8Fmz|NjomzWD$7;RFBPUb+15^ZmR3Ki#|g|MUHOU>d7g zH?IBvaQ*84_t&oc|8VOj*qrA_4*q+46{Pb+Y9IZzd3*Q|C@8C|Gz$a>i_H0 zC;z`bb^QP9lgIwQI)3#3t7Aw0zdCsgqW|cje;@AL{`2$0hyMut{{N2;Q2hS={~zz) z{r~X}gx~)E@%9Y_zj^)t` z)9I7{pC37R=KjWY86R)ogt!;v)|1DAg!(uMzTE}Z}W`uy4d zug{+T|LXL~|1VD+|NrXLiNE*Pu1rDJJCN-E{}~uSn2;M97#SGAn3;j$05e1nNFM;l CWq%d` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8c08338ba50069a50b687c7cae2133063b3438f7 GIT binary patch literal 1150 zcmZQzU}Ruq5D);-3Je)63=Con3=A3!3=9Gc3=9ek5OD?&U}0c5C)*qk>vl0a}#}@9X@dW&BgP7Utc))_x1U+ ze_x+F^Y``H(|=!`IraC|sgr+So;?0HZ$%!eUZ^?QOEUkwy>jW_=X-bmf4Y0;|HnJG z|9`xF>;H#aH~xRPdHw%~>(~CjzjpP1^0wsv$xmxB&DfUw|Lv8_|32Tp`~TCuyZ=Am zzXzt#%_>@3^gsDQ`Tyj5r6^|PEY11<_9{sKz5nm8UHSj^;`#q?FP!`T=KR_JZ_b_m z|N88y|F2J<{C{ZQ%Ku>h-zq@pKa%`^|IVfVKHRze=jVqH{}K58{~sTq`2G9;Ki^3>yyX-zdC;O|I4F?{=Yc1|Nrv?d;dS% zyX*h6-P`{^-Ldum)9stV7$kRR$%2f_lO_qgyLROp$PMoAK3hM@3!4RR;QEys@he|h-e|K|ty z{eQM^H`pB@H$C3DZ9YgZ2;ZDN!}Zhsd;i~Gx%B_t<%dvNcFA2p?o%V0v@;;=}h>E`!~G*B=M={(o`o@KumLWc+By*5Y^9uKas@ zcrpsYgeWq>m5k;|APz+ Z{~HLqpn;Kr0gRa$7!EKqF#P`y!2nP6d))v4 literal 0 HcmV?d00001 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;