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 zcmd5)O-~b16n&^`!^)*`=`V2O0yh}lxpC#j7-P^F6p_$z8&el{Su^u#z)&N0a2qezYoBQauuWF3Gs)Q|W;FJk>Yh+F!r`KGQ) zac%Ycmtq0GkjHUBMGnV#LN1G=Yz9Xe1xHE>hiMsysU$wj38YE8?DIx4)LYs+L2y;! zb|OVOWS1SX&|*VU(_^zDF=`PY{n4#Ew;J|Wm#cb-mn>$)%qHxax)ABoA>8ox>kH>eT1Fn zMuDKd{p-w?3#Zi)+_enMmzEcy)==+9^)E>}g%M!z<` zOII(~A8c-jJI?w&P}~m44jXwtggE&g?KNW8*zvQM7;%gBmo94g2F6aL{N8dd;1e4D z)Q9@-NS{&Ba<%xn>3%c$pw1I$CXpg9WV(l>(+2r8$UM2l>{`8@IK*e;onF SRQ&DftYJ*xBxCOgTHX(`q8=vz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..de29795390f51c819fdd6436ef59b97bc27c7450 GIT binary patch literal 1150 zcmc&yNl#N@6#Y=whLua>(qG`l1#U2!uyEtbjqNi8NmChYDh;$y0U6o?rL?6`N(E%J zAQadbBUo#J4)k>{gYCktxG=7GJ>K_fMKp0(nV0k3eD}*a_uTs~V`cP}moqvqv6^#? zU0{q|CQynp#XJSZ=xyU-5z_r14w*w%C0~@sIWGsfM;;gNe@mCSWmTMy0~h%LbeB10 zRerrT!jIU6sKYAk+ATuFY8E1vej#i&386lN5HxlR${FQp?l+zL?&{@+@gvX+V)PJ__girm?8q|fo zCC~Avy(~_U!BJL38b=vII)#s^Bz(SQXjZ8{&A-X3!kdjn#K}89HoBD@cOpJIOt2T> zupvf1c)JC>oTNID%-|GcFik-lDpdpe6ct<8AXtj1e) z1AL8234X2S^TdrS=fxe`HugN*pPzxKk)R&L`9;a6C#AYvInm}VO^^&n*G71r?LTqB-ap`Ww&Oyh3tbo!7n+#KFoQD#g;Gk(M}f8s z3=Cw(OuueR%U~1}FUNClsm8?UQXy|oIpw^4&bfz>E&S$k1h02U{stkp2qAY-n8Hk& z$3O@^tK3c{e*Xs-N0yARXE56BFlw|J?X(zeH(AiqS)gmo*Hq>=>daFW<|#6BYgOjT z5~|ED3cFfl_1DYk8C;!BU@;lPVtfk8=@6392_z>2hzB;rwh6J-hq>8>sAs@j-1h)| z){$kdmouzKkL7GC;%~i%1N1|$frb7f;p5gS>&WKyQ<3N1QMUu3(T1?o1lrbtHZ`ES z3RJ5@pehj5YY^Z)|F5f5*U4o3?Q4?2PsOlGHi|LEb6Cx}B3MOXs*u7L6lV|3p2qu$ zdTDPdg8^a2Ay`^KGoIFl3AvEJHGBUqzZj2FUe2nig40*3;8n}uO2^Um@fg&hb39%yc*Y)Ca!XtIKv)o5hQRy@xmlzE5~AeF)Jb>>7YO ojeF3909kz8gFtVv+1ob{vbujA0SMvx+vm|1Awt&)kx*IPcgJOa761SM 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 zcmc(d%TE(g6vi*=+H~d8xb%N;?XLesJ1#I1Vlc)KV#3xfE;JaUCSYU%#weu~=o`vR zAJfMa=!4cr`kZMyrN&^w^z+;q2CODNR%Y_e$vu;E&hNW(7#pL<;b8Q>!p1K!c8M`| zl|(7ZSa}MJ(YMfLOXm3>UaonU)BW152=4^ASKJCe|82SJh07^K1qkvFqOE zWi2BcYC2`8a?(&!2}4cBjdnsZ+LCCr#F#PpYI3ypq|dE|o5vj`I~-IFaClHgzg$AU zRD@pKhhEr&zPF3sZXSY%=GN~2+Jo{PB{v*Ysh)ZasueT-+-qui3c`nb5Gr>^dQ2=% zpp)nI6`G@A!gUte*S_e2YW9Tsr=y>o`*nNBW6+ z6nkA9b-Re?Bbf0`gWvy*cN&rsHrcgYM(iqCnw_@hn+!5Eo5N&DK(%=i78B=cL_>+{ zo0ai?sbKL^P8DNl$F|Vg3Zoegpb^|eee*r)>uacaS5aGgYl?p>FFYU5&CNNwyUJJ2 z(9IG9pPMA_(#~j~zy|6YKGc04OF{pa{QQH9e21E1?4@4VhvkFViCN{GoMk(TRwRT* z$d9^z-Q?g*pM9QZ_Wl)~JidO&{{d&nWh{mic_u$?ahtqE(2N96z3|-rqlee*`VeF1 z=pH}zl$^=%TOTyLxgE*dwRZgEUA;s1Fr" + 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;