From cc240e288f008afe839eb138a0a24fa5dbd05553 Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 22 Aug 2017 02:16:15 +0200 Subject: [PATCH] Redesigned several icons and reduced CD-ROM, floppy, and hard disk icons to just one instead of a different icon for each bus or type; Added a network activity indicator icon; The Video section of the Settings dialog is now called Display. --- src/NETWORK/net_ne2000.c | 18 +++ src/NETWORK/net_pcap.c | 85 +++++++++++++- src/NETWORK/net_slirp.c | 16 +++ src/NETWORK/network.c | 17 +++ src/NETWORK/network.h | 3 + src/WIN/86Box.rc | 84 ++++---------- src/WIN/ICONS/cdrom.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/cdrom_active.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/cdrom_atapi.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/cdrom_atapi_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/cdrom_atapi_dma.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/cdrom_atapi_dma_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/cdrom_atapi_dma_empty.ico | Bin 1150 -> 0 bytes .../ICONS/cdrom_atapi_dma_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/cdrom_atapi_empty.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/cdrom_atapi_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/cdrom_disabled.ico | Bin 1150 -> 1150 bytes src/WIN/ICONS/cdrom_empty.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/cdrom_empty_active.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/cdrom_scsi.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/cdrom_scsi_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/cdrom_scsi_empty.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/cdrom_scsi_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/display.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/floppy_35.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/floppy_35_1dd.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_1dd_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_1dd_empty.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_1dd_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2dd.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2dd_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2dd_empty.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2dd_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2ed.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2ed_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2ed_empty.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2ed_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2hd.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2hd_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2hd_empty.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_2hd_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_35_active.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/floppy_35_empty.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/floppy_35_empty_active.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/floppy_525.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/floppy_525_1dd.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_1dd_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_1dd_empty.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_1dd_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2dd.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2dd_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2dd_empty.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2dd_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2hd.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2hd_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2hd_empty.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2hd_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2qd.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2qd_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2qd_empty.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_2qd_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/floppy_525_active.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/floppy_525_empty.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/floppy_525_empty_active.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/floppy_disabled.ico | Bin 1150 -> 1150 bytes src/WIN/ICONS/hard_disk.ico | Bin 1150 -> 1150 bytes src/WIN/ICONS/hard_disk_active.ico | Bin 1150 -> 1150 bytes src/WIN/ICONS/hard_disk_ide.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/hard_disk_ide_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/hard_disk_mfm.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/hard_disk_mfm_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/hard_disk_removable_scsi.ico | Bin 1150 -> 0 bytes .../ICONS/hard_disk_removable_scsi_active.ico | Bin 1150 -> 0 bytes .../ICONS/hard_disk_removable_scsi_empty.ico | Bin 1150 -> 0 bytes .../hard_disk_removable_scsi_empty_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/hard_disk_rll.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/hard_disk_rll_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/hard_disk_scsi.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/hard_disk_scsi_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/hard_disk_xtide.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/hard_disk_xtide_active.ico | Bin 1150 -> 0 bytes src/WIN/ICONS/network.ico | Bin 1150 -> 1150 bytes src/WIN/ICONS/network_active.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/removable_devices.ico | Bin 1150 -> 1150 bytes src/WIN/ICONS/removable_disk.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/removable_disk_active.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/removable_disk_empty.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/removable_disk_empty_active.ico | Bin 0 -> 1150 bytes src/WIN/ICONS/video.ico | Bin 1150 -> 0 bytes src/WIN/win.c | 105 ++++++++++++------ src/WIN/win_settings.c | 16 +-- src/ibm.h | 3 +- src/pc.c | 1 - 93 files changed, 235 insertions(+), 113 deletions(-) create mode 100644 src/WIN/ICONS/cdrom.ico create mode 100644 src/WIN/ICONS/cdrom_active.ico delete mode 100644 src/WIN/ICONS/cdrom_atapi.ico delete mode 100644 src/WIN/ICONS/cdrom_atapi_active.ico delete mode 100644 src/WIN/ICONS/cdrom_atapi_dma.ico delete mode 100644 src/WIN/ICONS/cdrom_atapi_dma_active.ico delete mode 100644 src/WIN/ICONS/cdrom_atapi_dma_empty.ico delete mode 100644 src/WIN/ICONS/cdrom_atapi_dma_empty_active.ico delete mode 100644 src/WIN/ICONS/cdrom_atapi_empty.ico delete mode 100644 src/WIN/ICONS/cdrom_atapi_empty_active.ico create mode 100644 src/WIN/ICONS/cdrom_empty.ico create mode 100644 src/WIN/ICONS/cdrom_empty_active.ico delete mode 100644 src/WIN/ICONS/cdrom_scsi.ico delete mode 100644 src/WIN/ICONS/cdrom_scsi_active.ico delete mode 100644 src/WIN/ICONS/cdrom_scsi_empty.ico delete mode 100644 src/WIN/ICONS/cdrom_scsi_empty_active.ico create mode 100644 src/WIN/ICONS/display.ico create mode 100644 src/WIN/ICONS/floppy_35.ico delete mode 100644 src/WIN/ICONS/floppy_35_1dd.ico delete mode 100644 src/WIN/ICONS/floppy_35_1dd_active.ico delete mode 100644 src/WIN/ICONS/floppy_35_1dd_empty.ico delete mode 100644 src/WIN/ICONS/floppy_35_1dd_empty_active.ico delete mode 100644 src/WIN/ICONS/floppy_35_2dd.ico delete mode 100644 src/WIN/ICONS/floppy_35_2dd_active.ico delete mode 100644 src/WIN/ICONS/floppy_35_2dd_empty.ico delete mode 100644 src/WIN/ICONS/floppy_35_2dd_empty_active.ico delete mode 100644 src/WIN/ICONS/floppy_35_2ed.ico delete mode 100644 src/WIN/ICONS/floppy_35_2ed_active.ico delete mode 100644 src/WIN/ICONS/floppy_35_2ed_empty.ico delete mode 100644 src/WIN/ICONS/floppy_35_2ed_empty_active.ico delete mode 100644 src/WIN/ICONS/floppy_35_2hd.ico delete mode 100644 src/WIN/ICONS/floppy_35_2hd_active.ico delete mode 100644 src/WIN/ICONS/floppy_35_2hd_empty.ico delete mode 100644 src/WIN/ICONS/floppy_35_2hd_empty_active.ico create mode 100644 src/WIN/ICONS/floppy_35_active.ico create mode 100644 src/WIN/ICONS/floppy_35_empty.ico create mode 100644 src/WIN/ICONS/floppy_35_empty_active.ico create mode 100644 src/WIN/ICONS/floppy_525.ico delete mode 100644 src/WIN/ICONS/floppy_525_1dd.ico delete mode 100644 src/WIN/ICONS/floppy_525_1dd_active.ico delete mode 100644 src/WIN/ICONS/floppy_525_1dd_empty.ico delete mode 100644 src/WIN/ICONS/floppy_525_1dd_empty_active.ico delete mode 100644 src/WIN/ICONS/floppy_525_2dd.ico delete mode 100644 src/WIN/ICONS/floppy_525_2dd_active.ico delete mode 100644 src/WIN/ICONS/floppy_525_2dd_empty.ico delete mode 100644 src/WIN/ICONS/floppy_525_2dd_empty_active.ico delete mode 100644 src/WIN/ICONS/floppy_525_2hd.ico delete mode 100644 src/WIN/ICONS/floppy_525_2hd_active.ico delete mode 100644 src/WIN/ICONS/floppy_525_2hd_empty.ico delete mode 100644 src/WIN/ICONS/floppy_525_2hd_empty_active.ico delete mode 100644 src/WIN/ICONS/floppy_525_2qd.ico delete mode 100644 src/WIN/ICONS/floppy_525_2qd_active.ico delete mode 100644 src/WIN/ICONS/floppy_525_2qd_empty.ico delete mode 100644 src/WIN/ICONS/floppy_525_2qd_empty_active.ico create mode 100644 src/WIN/ICONS/floppy_525_active.ico create mode 100644 src/WIN/ICONS/floppy_525_empty.ico create mode 100644 src/WIN/ICONS/floppy_525_empty_active.ico delete mode 100644 src/WIN/ICONS/hard_disk_ide.ico delete mode 100644 src/WIN/ICONS/hard_disk_ide_active.ico delete mode 100644 src/WIN/ICONS/hard_disk_mfm.ico delete mode 100644 src/WIN/ICONS/hard_disk_mfm_active.ico delete mode 100644 src/WIN/ICONS/hard_disk_removable_scsi.ico delete mode 100644 src/WIN/ICONS/hard_disk_removable_scsi_active.ico delete mode 100644 src/WIN/ICONS/hard_disk_removable_scsi_empty.ico delete mode 100644 src/WIN/ICONS/hard_disk_removable_scsi_empty_active.ico delete mode 100644 src/WIN/ICONS/hard_disk_rll.ico delete mode 100644 src/WIN/ICONS/hard_disk_rll_active.ico delete mode 100644 src/WIN/ICONS/hard_disk_scsi.ico delete mode 100644 src/WIN/ICONS/hard_disk_scsi_active.ico delete mode 100644 src/WIN/ICONS/hard_disk_xtide.ico delete mode 100644 src/WIN/ICONS/hard_disk_xtide_active.ico create mode 100644 src/WIN/ICONS/network_active.ico create mode 100644 src/WIN/ICONS/removable_disk.ico create mode 100644 src/WIN/ICONS/removable_disk_active.ico create mode 100644 src/WIN/ICONS/removable_disk_empty.ico create mode 100644 src/WIN/ICONS/removable_disk_empty_active.ico delete mode 100644 src/WIN/ICONS/video.ico diff --git a/src/NETWORK/net_ne2000.c b/src/NETWORK/net_ne2000.c index c77b1c745..b6bc277a1 100644 --- a/src/NETWORK/net_ne2000.c +++ b/src/NETWORK/net_ne2000.c @@ -1686,6 +1686,8 @@ mcast_index(const void *dst) static void nic_tx(nic_t *dev, uint32_t val) { + update_status_bar_icon(SB_NETWORK, 1); + dev->CR.tx_packet = 0; dev->TSR.tx_ok = 1; dev->ISR.pkt_tx = 1; @@ -1694,6 +1696,8 @@ nic_tx(nic_t *dev, uint32_t val) if (dev->IMR.tx_inte) nic_interrupt(dev, 1); dev->tx_timer_active = 0; + + update_status_bar_icon(SB_NETWORK, 0); } @@ -1714,6 +1718,8 @@ nic_rx(void *priv, uint8_t *buf, int io_len) int idx, nextpage; int endbytes; + update_status_bar_icon(SB_NETWORK, 1); + if (io_len != 60) nelog(2, "%s: rx_frame with length %d\n", dev->name, io_len); @@ -1742,11 +1748,15 @@ nic_rx(void *priv, uint8_t *buf, int io_len) #endif ) { nelog(1, "%s: no space\n", dev->name); + + update_status_bar_icon(SB_NETWORK, 0); return; } if ((io_len < 40/*60*/) && !dev->RCR.runts_ok) { nelog(1, "%s: rejected small packet, length %d\n", dev->name, io_len); + + update_status_bar_icon(SB_NETWORK, 0); return; } @@ -1767,6 +1777,8 @@ nic_rx(void *priv, uint8_t *buf, int io_len) /* Broadcast not enabled, we're done. */ if (! dev->RCR.broadcast) { nelog(2, "%s: RX BC disabled\n", dev->name); + + update_status_bar_icon(SB_NETWORK, 0); return; } } @@ -1778,6 +1790,8 @@ nic_rx(void *priv, uint8_t *buf, int io_len) #if 1 nelog(2, "%s: RX MC disabled\n", dev->name); #endif + + update_status_bar_icon(SB_NETWORK, 0); return; } @@ -1785,6 +1799,8 @@ nic_rx(void *priv, uint8_t *buf, int io_len) idx = mcast_index(buf); if (! (dev->mchash[idx>>3] & (1<<(idx&0x7)))) { nelog(2, "%s: RX MC not listed\n", dev->name); + + update_status_bar_icon(SB_NETWORK, 0); return; } } @@ -1829,6 +1845,8 @@ nic_rx(void *priv, uint8_t *buf, int io_len) if (dev->IMR.rx_inte) nic_interrupt(dev, 1); + + update_status_bar_icon(SB_NETWORK, 0); } diff --git a/src/NETWORK/net_pcap.c b/src/NETWORK/net_pcap.c index 324b368b3..b40144e24 100644 --- a/src/NETWORK/net_pcap.c +++ b/src/NETWORK/net_pcap.c @@ -215,10 +215,15 @@ network_pcap_setup(uint8_t *mac, NETRXCB func, void *arg) mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); if (f_pcap_compile(pcap, &fp, filter_exp, 0, 0xffffffff) != -1) { - if (f_pcap_setfilter(pcap, &fp) == -1) + if (f_pcap_setfilter(pcap, &fp) == -1) { pclog(" Error installing filter (%s) !\n", filter_exp); + f_pcap_close(pcap); + return (-1); + } } else { pclog(" Could not compile filter (%s) !\n", filter_exp); + f_pcap_close(pcap); + return (-1); } /* Save the callback info. */ @@ -269,6 +274,84 @@ network_pcap_close(void) } +/* Test WinPcap - 1 = success, 0 = failure. */ +int +network_pcap_test(void) +{ + char temp[PCAP_ERRBUF_SIZE]; + char filter_exp[255]; + struct bpf_program fp; + char *dev; + + /* Did we already load the DLL? */ + if (pcap_handle == NULL) + { + return 0; + } + +#if 1 + /* Get the value of our capture interface. */ + dev = network_pcap; + if (dev == NULL) { + pclog(" PCap device is a null pointer!\n"); + return 0; + } + if ((dev[0] == '\0') || !strcmp(dev, "none")) { + pclog(" No network device configured!\n"); + return 0; + } + pclog(" Network interface: '%s'\n", dev); +#endif + + strcpy(temp, f_pcap_lib_version()); + dev = strchr(temp, '('); + if (dev != NULL) *(dev-1) = '\0'; + pclog("PCAP: initializing, %s\n", temp); + +#if 0 + /* Get the value of our capture interface. */ + dev = network_pcap; + if ((dev[0] == '\0') || !strcmp(dev, "none")) { + pclog(" No network device configured!\n"); + return 0; + } + pclog(" Network interface: '%s'\n", dev); +#else + dev = network_pcap; +#endif + + pcap = f_pcap_open_live(dev, /* interface name */ + 1518, /* maximum packet size */ + 1, /* promiscuous mode? */ + 10, /* timeout in msec */ + temp); /* error buffer */ + if (pcap == NULL) { + pclog(" Unable to open device: %s!\n", temp); + return 0; + } + + /* Create a MAC address based packet filter. */ + sprintf(filter_exp, + "( ((ether dst ff:ff:ff:ff:ff:ff) or (ether dst %02x:%02x:%02x:%02x:%02x:%02x)) and not (ether src %02x:%02x:%02x:%02x:%02x:%02x) )", + 0, 1, 2, 3, 4, 5, + 0, 1, 2, 3, 4, 5); + if (f_pcap_compile(pcap, &fp, filter_exp, 0, 0xffffffff) != -1) { + if (f_pcap_setfilter(pcap, &fp) == -1) { + pclog(" Error installing filter (%s) !\n", filter_exp); + f_pcap_close(pcap); + return 0; + } + } else { + pclog(" Could not compile filter (%s) !\n", filter_exp); + f_pcap_close(pcap); + return 0; + } + + f_pcap_close(pcap); + return 1; +} + + /* Send a packet to the Pcap interface. */ void network_pcap_in(uint8_t *bufp, int len) diff --git a/src/NETWORK/net_slirp.c b/src/NETWORK/net_slirp.c index 514845fdb..b271c4ca8 100644 --- a/src/NETWORK/net_slirp.c +++ b/src/NETWORK/net_slirp.c @@ -164,6 +164,22 @@ network_slirp_close(void) } +/* Test SLiRP - 1 = success, 0 = failure. */ +int +network_slirp_test(void) +{ + if (slirp_init() != 0) { + pclog("SLiRP could not be initialized!\n"); + return 0; + } + else + { + slirp_exit(0); + return 1; + } +} + + /* Send a packet to the SLiRP interface. */ void network_slirp_in(uint8_t *pkt, int pkt_len) diff --git a/src/NETWORK/network.c b/src/NETWORK/network.c index 1534d047f..d475aea0c 100644 --- a/src/NETWORK/network.c +++ b/src/NETWORK/network.c @@ -138,7 +138,24 @@ network_close(void) network_slirp_close(); break; } +} + +/* Test the network. */ +int +network_test(void) +{ + switch(network_type) { + case NET_TYPE_PCAP: + return network_pcap_test(); + break; + + case NET_TYPE_SLIRP: + return network_slirp_test(); + break; + } + + return 0; } diff --git a/src/NETWORK/network.h b/src/NETWORK/network.h index 1c3e748a1..6ec70e6c5 100644 --- a/src/NETWORK/network.h +++ b/src/NETWORK/network.h @@ -59,6 +59,7 @@ extern char network_pcap[512]; extern void network_init(void); extern int network_attach(void *, uint8_t *, NETRXCB); extern void network_close(void); +extern int network_test(void); extern void network_reset(void); extern void network_tx(uint8_t *, int); @@ -66,10 +67,12 @@ extern int network_pcap_init(netdev_t *); extern void network_pcap_reset(void); extern int network_pcap_setup(uint8_t *, NETRXCB, void *); extern void network_pcap_close(void); +extern int network_pcap_test(void); extern void network_pcap_in(uint8_t *, int); extern int network_slirp_setup(uint8_t *, NETRXCB, void *); extern void network_slirp_close(void); +extern int network_slirp_test(void); extern void network_slirp_in(uint8_t *, int); extern int network_dev_to_id(char *); diff --git a/src/WIN/86Box.rc b/src/WIN/86Box.rc index dedc5be47..24fe7a2f8 100644 --- a/src/WIN/86Box.rc +++ b/src/WIN/86Box.rc @@ -505,74 +505,34 @@ END /* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC2_256x256.png */ 100 ICON DISCARDABLE "WIN/ICONS/86Box.ico" #endif -128 ICON DISCARDABLE "WIN/ICONS/floppy_525_1dd.ico" -129 ICON DISCARDABLE "WIN/ICONS/floppy_525_1dd_active.ico" -130 ICON DISCARDABLE "WIN/ICONS/floppy_525_2dd.ico" -131 ICON DISCARDABLE "WIN/ICONS/floppy_525_2dd_active.ico" -132 ICON DISCARDABLE "WIN/ICONS/floppy_525_2qd.ico" -133 ICON DISCARDABLE "WIN/ICONS/floppy_525_2qd_active.ico" -134 ICON DISCARDABLE "WIN/ICONS/floppy_525_2hd.ico" -135 ICON DISCARDABLE "WIN/ICONS/floppy_525_2hd_active.ico" -144 ICON DISCARDABLE "WIN/ICONS/floppy_35_1dd.ico" -145 ICON DISCARDABLE "WIN/ICONS/floppy_35_1dd_active.ico" -146 ICON DISCARDABLE "WIN/ICONS/floppy_35_2dd.ico" -147 ICON DISCARDABLE "WIN/ICONS/floppy_35_2dd_active.ico" -150 ICON DISCARDABLE "WIN/ICONS/floppy_35_2hd.ico" -151 ICON DISCARDABLE "WIN/ICONS/floppy_35_2hd_active.ico" -152 ICON DISCARDABLE "WIN/ICONS/floppy_35_2ed.ico" -153 ICON DISCARDABLE "WIN/ICONS/floppy_35_2ed_active.ico" -160 ICON DISCARDABLE "WIN/ICONS/cdrom_atapi.ico" -161 ICON DISCARDABLE "WIN/ICONS/cdrom_atapi_active.ico" -162 ICON DISCARDABLE "WIN/ICONS/cdrom_atapi_dma.ico" -163 ICON DISCARDABLE "WIN/ICONS/cdrom_atapi_dma_active.ico" -164 ICON DISCARDABLE "WIN/ICONS/cdrom_scsi.ico" -165 ICON DISCARDABLE "WIN/ICONS/cdrom_scsi_active.ico" -176 ICON DISCARDABLE "WIN/ICONS/hard_disk_removable_scsi.ico" -177 ICON DISCARDABLE "WIN/ICONS/hard_disk_removable_scsi_active.ico" -192 ICON DISCARDABLE "WIN/ICONS/hard_disk_mfm.ico" -193 ICON DISCARDABLE "WIN/ICONS/hard_disk_mfm_active.ico" -194 ICON DISCARDABLE "WIN/ICONS/hard_disk_xtide.ico" -195 ICON DISCARDABLE "WIN/ICONS/hard_disk_xtide_active.ico" -196 ICON DISCARDABLE "WIN/ICONS/hard_disk_rll.ico" -197 ICON DISCARDABLE "WIN/ICONS/hard_disk_rll_active.ico" -198 ICON DISCARDABLE "WIN/ICONS/hard_disk.ico" -199 ICON DISCARDABLE "WIN/ICONS/hard_disk_active.ico" -200 ICON DISCARDABLE "WIN/ICONS/hard_disk_ide.ico" -201 ICON DISCARDABLE "WIN/ICONS/hard_disk_ide_active.ico" -202 ICON DISCARDABLE "WIN/ICONS/hard_disk_scsi.ico" -203 ICON DISCARDABLE "WIN/ICONS/hard_disk_scsi_active.ico" +128 ICON DISCARDABLE "WIN/ICONS/floppy_525.ico" +129 ICON DISCARDABLE "WIN/ICONS/floppy_525_active.ico" +144 ICON DISCARDABLE "WIN/ICONS/floppy_35.ico" +145 ICON DISCARDABLE "WIN/ICONS/floppy_35_active.ico" +160 ICON DISCARDABLE "WIN/ICONS/cdrom.ico" +161 ICON DISCARDABLE "WIN/ICONS/cdrom_active.ico" +176 ICON DISCARDABLE "WIN/ICONS/removable_disk.ico" +177 ICON DISCARDABLE "WIN/ICONS/removable_disk_active.ico" +192 ICON DISCARDABLE "WIN/ICONS/hard_disk.ico" +193 ICON DISCARDABLE "WIN/ICONS/hard_disk_active.ico" +208 ICON DISCARDABLE "WIN/ICONS/network.ico" +209 ICON DISCARDABLE "WIN/ICONS/network_active.ico" 256 ICON DISCARDABLE "WIN/ICONS/machine.ico" -257 ICON DISCARDABLE "WIN/ICONS/video.ico" +257 ICON DISCARDABLE "WIN/ICONS/display.ico" 258 ICON DISCARDABLE "WIN/ICONS/input_devices.ico" 259 ICON DISCARDABLE "WIN/ICONS/sound.ico" 260 ICON DISCARDABLE "WIN/ICONS/network.ico" 261 ICON DISCARDABLE "WIN/ICONS/other_peripherals.ico" 262 ICON DISCARDABLE "WIN/ICONS/hard_disk.ico" 263 ICON DISCARDABLE "WIN/ICONS/removable_devices.ico" -384 ICON DISCARDABLE "WIN/ICONS/floppy_525_1dd_empty.ico" -385 ICON DISCARDABLE "WIN/ICONS/floppy_525_1dd_empty_active.ico" -386 ICON DISCARDABLE "WIN/ICONS/floppy_525_2dd_empty.ico" -387 ICON DISCARDABLE "WIN/ICONS/floppy_525_2dd_empty_active.ico" -388 ICON DISCARDABLE "WIN/ICONS/floppy_525_2qd_empty.ico" -389 ICON DISCARDABLE "WIN/ICONS/floppy_525_2qd_empty_active.ico" -390 ICON DISCARDABLE "WIN/ICONS/floppy_525_2hd_empty.ico" -391 ICON DISCARDABLE "WIN/ICONS/floppy_525_2hd_empty_active.ico" -400 ICON DISCARDABLE "WIN/ICONS/floppy_35_1dd_empty.ico" -401 ICON DISCARDABLE "WIN/ICONS/floppy_35_1dd_empty_active.ico" -402 ICON DISCARDABLE "WIN/ICONS/floppy_35_2dd_empty.ico" -403 ICON DISCARDABLE "WIN/ICONS/floppy_35_2dd_empty_active.ico" -406 ICON DISCARDABLE "WIN/ICONS/floppy_35_2hd_empty.ico" -407 ICON DISCARDABLE "WIN/ICONS/floppy_35_2hd_empty_active.ico" -408 ICON DISCARDABLE "WIN/ICONS/floppy_35_2ed_empty.ico" -409 ICON DISCARDABLE "WIN/ICONS/floppy_35_2ed_empty_active.ico" -416 ICON DISCARDABLE "WIN/ICONS/cdrom_atapi_empty.ico" -417 ICON DISCARDABLE "WIN/ICONS/cdrom_atapi_empty_active.ico" -418 ICON DISCARDABLE "WIN/ICONS/cdrom_atapi_dma_empty.ico" -419 ICON DISCARDABLE "WIN/ICONS/cdrom_atapi_dma_empty_active.ico" -420 ICON DISCARDABLE "WIN/ICONS/cdrom_scsi_empty.ico" -421 ICON DISCARDABLE "WIN/ICONS/cdrom_scsi_empty_active.ico" -432 ICON DISCARDABLE "WIN/ICONS/hard_disk_removable_scsi_empty.ico" -433 ICON DISCARDABLE "WIN/ICONS/hard_disk_removable_scsi_empty_active.ico" +384 ICON DISCARDABLE "WIN/ICONS/floppy_525_empty.ico" +385 ICON DISCARDABLE "WIN/ICONS/floppy_525_empty_active.ico" +400 ICON DISCARDABLE "WIN/ICONS/floppy_35_empty.ico" +401 ICON DISCARDABLE "WIN/ICONS/floppy_35_empty_active.ico" +416 ICON DISCARDABLE "WIN/ICONS/cdrom_empty.ico" +417 ICON DISCARDABLE "WIN/ICONS/cdrom_empty_active.ico" +432 ICON DISCARDABLE "WIN/ICONS/removable_disk_empty.ico" +433 ICON DISCARDABLE "WIN/ICONS/removable_disk_empty_active.ico" 512 ICON DISCARDABLE "WIN/ICONS/floppy_disabled.ico" 514 ICON DISCARDABLE "WIN/ICONS/cdrom_disabled.ico" @@ -719,7 +679,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_2064 "Configured video BIOS not available.\nDefaulting to an available video BIOS." IDS_2065 "Machine" - IDS_2066 "Video" + IDS_2066 "Display" IDS_2067 "Input devices" IDS_2068 "Sound" IDS_2069 "Network" diff --git a/src/WIN/ICONS/cdrom.ico b/src/WIN/ICONS/cdrom.ico new file mode 100644 index 0000000000000000000000000000000000000000..89757bd3695600054bc38c401907c0c095826b48 GIT binary patch literal 1150 zcmZuwOGsNm6n)ZH+cb*i)I*&W^=FUBL?&l20Wzm+GAP#c)ebDJRTSf2DG%aL@O#PzLI6(O+M(JrwWB48Hq%YPN%W8 zwS`nFg^i63tgpwh7+#0LHi~yO@A#aYoX1yvl$4Y_>gnm(J~%kQ{{B9a$t0McKp=p* zc@d+6ALida7#1AR+cc=Dso}50ai^)NX@c1w9v(`vxw(m8FbJ1>7FwGdY9|jhZ^5u# zjnNS`EPef`tgK|YWYhXYr_)`CqKH^5CgEB9qUc{$eK%^p_79qrKL;~IV|^0V)vv+y z;4iecwnhnGB$LVHCX)$vyPYs1qR}YjobporUJVQkba!@kw!Z&R_g2@Z%((isgtfw9 zbAavy>q}c(+Yk-t^?J$248=U<5*lgW+uYoo*WTV<*4^FRrv0WgIW?D9hr^1DmI)z;QNUs&>; z{|WgKUh-qjzlha95Rq^M6t~1h#w~_FJ39l_BgweVu>Xc!E|)DYEuL?#Mv+{LBN0!4 z<;(cXxXgHYbaVu&{dQ?->9c>ht7~0d-E*o}IF(FE_AGA7UCNvIc+u6>HNm)k6?6Tc z)q~ZP-k?IG(dbnw)eyZsIpZnW-nnkSo6B(#de!z@9QP^f`sx3BX2Wb5hGG8#akOCa literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/cdrom_active.ico b/src/WIN/ICONS/cdrom_active.ico new file mode 100644 index 0000000000000000000000000000000000000000..1aa7bca695d24803de225910e4d33e86f8822063 GIT binary patch literal 1150 zcmah|TS!z}7+#y4v6srH11BU7C1`M-dJrFuzW5>*ab9`}3Mr7nK+x0C6QpGf6nU`W zNZ^G*2b0FiF=m_-gO?d?oZEKB+|FdmTx^&bXT%&G7027xzji1gL2L7^wb#G@Z>|6G zZN>z8a&j2Wzp-0cjQzqGDhnb(Ef)oBMl3MMYm*TU&Z`bQE5%7jCy3cXf9m_yn*J zJA~jB_Rl{$fBWDJx~E*NRwu&YFw*HXmY0{2OeV3oxQKKAp96Ce_XtkDIQfb5i;9Xa zXf&EH>+9=STU$dSkpMr(@AtzqB|+$+yA2EqlLE(0$B{LdCGVBp$~B@Z8X6kLxc}zn zri`VfB?JNiIGmH{8*<{;t}{4mJc~>AONTi9_B52wl@n!UWq^LhM| zA5+acZ<(%|V{jT-) z_I9?nw?F;spPJkC-Bp=q_NUPLyYa;F1P@<61n*08bMq@2(ChW`8Fq^Ky+gc5`>w{u z#+;UxmXglS&gQ=V+Ke`x8P*{ytX3;{e|T?OTU+&|xWipxGI7V#dnW-7LTrP}{kHcoOf$M|rSKIA&j9A_i*A0V9#OUP2m?(-}6u;JN zHuqCb|HfjmL_8ixFc_5k;&eK}HC97UZcUm!8F%tUS3}ITZ19wnwy7nehMDH6Ml~a^R7t*r{@rjM3G9R zu)V#Fot+(QY;0g`~aF22d=6B|tGv8&bk3aqWjK4oI(`&{) zGR8i0<1X%b^z#p6eC@-#M-%fGUMiL9>)6=Xiq&c@E-o%UEG#VC+wJxO_bm?%4Sjh5 z5iY*|R;SaseLkO5sZ=N)kJHi75tYkjDijKIaBx6ww_DO^G^>MygKv~^z?w{^aH&+H z+uK`eG#ZphBnWev&*gG-cz8&=ySvilX&)+*K9Ty zTrSto%gal_pPijiwOXZMFeo^K!I0#AO(9Mo5O~JV%*^!u#~Y2t6z9|b;%zot*WqxK zpPrB0l==Jpeu~9nqBdpz)6>&A-oLfe(^Cocqvyz<&xL+a$Ii|UrBW$EZO6yQqR;#L z`xFj`X>@dSd3bnuV10f47x?q@b79zvSTHc~BgcBZF2<;5c6L_ccQ5n|-9n$x-ObI7 z&;jm5z87%Nlx)x;*X)|CVd!^iYAOuP-QC>@Yq#4%OU-6e#Od{V)a`bKp7_1&DfNpu zh%qrS;qiLC63*>(I>HbSc|n^S8ygbObxp6=|MmaKdEm=?GQeYr|95_V{(f$5?!jWQ el(>IIu2;Fg^`5c4SB%;F9!}+Fv|=C5B;u8^${D?(Af^K47|= zjNNC9Jw%`hEwUXSjN!L?cVzJWKbD@Jp2te1a&ByFEIBhXb2>deePTA76B>hNS#Sv% zaY+QNR~r*-!qav-a&BuhnpaMzvz5(eVSRlaGMNmd(`i`xwglo=5k#pCxEJ2YK8UN+ z=>n-#3M!Qf9336O#>NKFp7^GZrmNg@KU$CW3+13zt6$SO;u6Z`G9;5pNF)-RFTTgP zx#xfTKzmYk&*uZ@C#PJ0`q?EP>sRa5%M%k5se^+9C>D#HOF6Huu7ca`hDapBLGO+a z4j5g=_}KrEcO&5b>;}DFpO~GUJ=@>k=lpy=54*d&;P?AEZ)j*JgngCBkJsyk&CN{+ zhrzs$+3+5hO_hs%>j)i}!hLZ4Cl}04NlS7rni`U3R z7$D8nYBi2(waT@0e0 zX>(y=p@q554-5=k;kNt1o^+uv{{K!*O`S|mPM#W##uVD;F6wPRU+!RR1r6qN;N#lM OjOPg}HyA75W$YK57`cl8 diff --git a/src/WIN/ICONS/cdrom_atapi_dma.ico b/src/WIN/ICONS/cdrom_atapi_dma.ico deleted file mode 100644 index 972e1001f88a7d3fafb242ab33a9606083fc076e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmaKrNla5w6owzsg~mi0V~B|)WmF_su?tzSkSMSaMWH||5s{&Ql9(vnNF)*h3z@~x zf=mGsFwQ`5pemyT2%{hcQ7KY1;y^{pppV~kODZ*>c{y)5?|%Oo?ztRiL6<*^J+7+=PdMU7aN1O3w=!ny}2Gh2Zq!dB22=A(12^ z*TyGk&l-r)WgQr}Q7n_^Cs)?;S6&;is~LzG29Cc1d|v{RE(1K2HN10xTqWEey1`tB zu^w_oW8Ls1TJ=EvSHPtO2p(MF5A*_VU4ZzJj^A-o@!VWPB#ka$Y#XtRZ<+=|`hlZl zruZh_r5&)ZnSiaoT*Y#5@;fCytg7YZ13>N63a@+*cy+JM+r9v-(;o1wAFe@iRraU> zL4Cl%PT=x8ppoKV?A2rQ^)XmgXd!;4hk1O)Td8MZb1W=3EGcWalHwM804@<5KsxSE z^>8fH;70eD(Hu%Oa8~P$^|SmLzm@vC{cP$`Y~Zk{0Sg!oc4`2!jwN_?J55wO?voK zZM)l-%<@kk6a_}+m5m#CR(}rlJd5}=s)1?PQ60icEzWf4QB2w?Zva`}5(Mf+SU#MA z9re$_H)L;YY0a+^;!7rhLh3;tt<5E^9MVdD3zU)X)<@tbSt-4HcKn1O=??GcbHX^! zBH8Kut9?2={sPpIRnvalBfCv~EhWt=;#z4>o4?U)k(KmMz(Ep~XPRL)ziyF=#=9CF zx_pX(_tDSY0R~RifX=f%76h{+cyhz zlGYPC51pS4NUf^o#j=<@Vd&rI$CL+qvVQE8L@K@G(>2nx;(1AG(ZW7O#;~1VxYE%t cY}NUlw&b{mbsU#yv25mAYrUJ+F@~|f0leCMbN~PV diff --git a/src/WIN/ICONS/cdrom_atapi_dma_active.ico b/src/WIN/ICONS/cdrom_atapi_dma_active.ico deleted file mode 100644 index 17c857426c2299b508179828440500c9c4311558..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmaKrX-HI26vwaBha$)cLV|)RQ!*+uKP2Rb1eXtGi@A(hrfjNx#!&b7&D@uK)~p} zmj!NS%!Dy!L81^v^l=&(qyKhn(@XdMkDKt6mz9O9IK$yql9Ef#U+_vSn0JXv8nh1; zSNm3oM}qI3a7pC3z(H{)=RhI8@t%-NEsLL8%3crJwYC>Ld`S0)*u%9p@ko zRX7ENb(fHjphN|mSJc-IU|$=sllEsUj$B2~-2`VM=uf%T&15 zsYU^L$GrtSdzT=nUxab(EKJXH>1JoWj|CMy`&~$U;S`WZJ;ExA0Ua_MV^z6|23xb$Rt@-K8M|J1N^J@0}-bp#7MkEyRk{7CMXdH2*32jLZS_S)gus0=9nP4Z@Q? zTUK~}4oG1fqV=w;Ec;T28uc{OZeY{rrR&|M-T?Fxm<~sa1KXEIHa4g*<`g5DCz_Z zOA#CqNtu*W^9PoN9_R7f^PaPlzsj-ayquTk^L>82&kJKU^r@|7^t{AwoM!AIW9%{+ zZPAXtPYYx8+l6zwY47x?tE)R?rVj5_tKfG#`=cNH(J{pvNo>1cL<@Ey;4*c1t{n9@ z-kU_vS%)NhUZ!*E(2@dc5eO^*UEcs#84%|bJc?)4WPB zH}L)!U?bj3tiiW^0a`u-j$B2(>kADZ)UZpzF3x_cLgQyi!$&cB+@rj$1ei1HxZ{=u z9^2~bzW!u5r^*y7_hX+QSp}RF?_a!W7HEo0tGplgMOhf6dZl@wjr=3ufg2m^%F~e>hg0ptxh}K$ut$={%UJ!jfD>dVW5uE2Q|_B;4~8;tNT(sWdW^r-KeiQ&oxlhBGEO-( zeF9&V!m*Ek!R+$8ES^thw zTe1{=cb0b15S~;mkA2!a+oc{)yj($k6PO{((s^XaCds%z=lERC(z$X=mDgc$%c3#E ze12Q}q0uRt!SWU`M`p}of&8aQ=lc$@tk7&PRnRJjMh?!eaR+RkXVO4AtCoH$SRmi8 z+qxFN4|AJ4h)iTvhbJhSe24Fkkq2LSKdgf6Zm0Vz(cKjy38m$Ev`D>jTU_18?(fEV W#zsytcCSV^$=kT28{$1zX_j4Z@E2D3DIiu?pcK0k}ml`FR=`qi2^cnxkuii>sxSJ@OH~5qbC?nziO`&VEZH$Ip?6J_#sDoEP5Fx=WA# z_n>*1qUYv|v1ryranWBVyn6$X&ljz~PzPbYrqrYV&SZ<)q#B`owTr-0inp%;aoYbt zG7YhJ9S{7QsP~5Q`Oj9L@RYxpYHApC#zVBOXA2l4Rzp6Ir_+%7mJwXs$Vuv5My)4= zdPhBY{qOZxp(+qTt;HU*jQI9LsXRYQ9>eQ^B#`IiroPEevo-vIe5!pLXs7)(CFuDa zaG&a1WAp5qou}}|zOdY6jhw=#wS&&t(^Qw zGtFwFIplz8hs@B>9;&_fa<}Ctn|75TE2gJHLm0~W_EyS(iFXqFlmCs z<2lFsa*p0Bmp{1$snVn_^gr+4c7t_%l6o+?3w$RPdND@v5%O8v2UauG+bi4XFj?J_ zj+f^OJRiA7ljfCnAUKsx{LWyBVt?%Az4&?fzOxT|Xe!&PF{>r|QnuKK*F&Z vYU%8%?A}cKYe$@FrIadqa`_g=r^*;})Bix@k!U#e(@61L?lX*~E;9BHdr9}Z diff --git a/src/WIN/ICONS/cdrom_atapi_empty.ico b/src/WIN/ICONS/cdrom_atapi_empty.ico deleted file mode 100644 index 67c2c834705f6c5d4ee1a05a95e3585017bfc0a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmah}NsC%R5bhy!NXQ|ROU^mwmP~$>%+JW(n>y~Gs22qhmxH*F(TliykZ|JN$JiD9Zf+PoKeM}Q#y&B|z7WVnmb0A}#%S;3`!mEl zJv1843+QyZZx)Ni7zhMv@p$}5cn*a^k7T>o>-AqR{pCCDzq8xzmRv5UOs7-cZnybl zGU4O#n2$yy-tYH$DwR^KR;x*?)xMQHtl)Y)o)mod`#s-ox4hHo2(IK01_KeJR;wva zr}L*e2F0{VF8Ba)0+;-5x67;5DyN(#8~>Be>u%77LD?|KdYiB9Tzg z57dKthr^-JH=E5w3~-CZA}^QAyxDAuSm*)rgAbd@WV(+;B6Z|ltyUadXvQA6yS14L~UyQKA*2j{WFth1@)un&<`L6>Hxq&ZRijBjQ-T? zb`3SXKZvz%ef zugm31;p`5F!ymwRx7&$Wr_+fak4G_2bS@9-`IUFTX0utd*{p)x@C6W0YRc#H3TZVv z9F7zGj&UP#QlxMV$X!5-|w%JoytAetM*@hVC>-yV?VCWkl%&ZR_O;0xW563 CS0l~< diff --git a/src/WIN/ICONS/cdrom_atapi_empty_active.ico b/src/WIN/ICONS/cdrom_atapi_empty_active.ico deleted file mode 100644 index a6d2044995626f20c09f62c423b07752da5e5655..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmah}+iQ|x9DYY#6kW7#y6&>OT7O6XgnpX@5p)y5AaLw*cVeDH(A`Yt#KYQ9Y|aAl zEKw|nh{q|4r+J!^y#1cneWgY9eLUaG_xpa&^E)bID|D}}GI~B>&u%hypE353Kqj)x z?Q}3k-|pR+L%h>NrBW?HqtQGz8jU)a%k?b~2uui99*^g2%eZy8ez2aCd=gh4D8DF7 zil>WQ;@q}aEXG(YHfuJUyih3cMx(*&^*TTKe8Qzq5|`2opm)W)xdynqySu0G9gRkO zFc|P+u_(B(ZGYHa=3eV4oyw2M!DKR-WiI$YtyU9&U3yP(t8f0)AiGYddlC+ZXYlLy z`+^I8r_Yssfo}qs99Qgy#Kpg-$s13bEpV6OeHp}&T{adY8 zyB3K=zJm`R8PEd2fo(BI5L zhS%HdO%Y?|jIp~2+`^s0J_g3{zop6ol;?k6itFm?D*O8So(>HSy&4=GY|?7Aj~V;+ zjRb&M}A)75Hq^~A)4&Th9Gg25ofVlfZ|0XjQ3+$z=T??;cON0C#(nCTYs ze=xT4^1KGVr`BqSdL4eEoj z{{H?uPN#D^pU*2?;!&MMA_38u2xaBg+-@um`jM^mLJi|gp^sHR#v%aFQ$Fztxm*rX zsT4%`D0l-rR8(2zIg8J<6>`HDy~9ybV$L@-e8;nxHin0X?{9B!FN&fFvMein>R%M& zLGtNG1|FGt$s<6mqH_f@Ksx`TzW8F=2F`LbuUauFh2c-t}%teGIeAX^4 zEtOa-mIn@pL+!QMdpXZOgaRQYkLE+Owb^Vv#NXN3fjxf!d|?4NL3r(UyW3D3)%^VY zwY|N)u1Jvk97hd#o`-Na3>?P+`2*kI5{X107~&MJj~5^q<@7jrE%yI$e}BIl&-6B% z%}yc|U1=^V(Wt}o6(g9zV5k?9 z@r7h64(VhZGVugt5-G())HCH1kN9V2XMlQ4lGllQzE)ONo=eHZLXPH_$pY~R zCr(aINc-u5fq~j{-o=Pss7JlVh(r0*H-YZakBc}*J$d~i=kh)2L7Jj(T09<4kIUui mTwY#oCZA$1egXbol8P}uZUI7v_}|iDK3qZ0RmP+njQs(UJBnWb literal 1150 zcmah|O;1`u6rGoL(b7fj#*HqzY156iHgRM0SFmh5M?)U;hg)ArYd z*nKSo-BA+ExxcWm@GhNBw=OR)sZc0TsZ^41yT4L*_a_=3Pu|YW%}w|Aet06po?nRl zSKx!Yw6qkzxVWHty-u}Sjf%x0VGfPqVT*je91RUww6gN0wYa#r*3+Xu3W_92Q6A&J|w^2KdotdJ6^B%rC}H?#8<1;pZu$}T6HWwTkDn)*ymXO;}3Kqn_B ziYV+g?%fPisV8km&-{mVu5tprpd`e&cmj@K9l{h$>lm?FT&}qt*r*Q z!1eVtA@75O1IY`8Lfh=?4m2{EjLZ-J;VsT57K>H?!{1@P@i%@v9f&*!B_o%@Hw;S~GlX3tvCK<)rMga+z>f8d}ttSf(xkB@0~cJ}Se%*;S4m1?T` z5vP1mT9|j{2)&JsjTWE%bMz1T7H5aP18^P+il_PtZ^UxXy1~VR{tX6$vVR+m1}Pv` z={1{8y1BWL{mADMo0yom*JigzXmB6D$Njg|j#@g&9={Q-Xc^BL7RmJ#EdUwSCSchxonw*UYD diff --git a/src/WIN/ICONS/cdrom_empty.ico b/src/WIN/ICONS/cdrom_empty.ico new file mode 100644 index 0000000000000000000000000000000000000000..0653c8e27d77eae2cb97a0cc623a47a0e3144929 GIT binary patch literal 1150 zcmZvc%S#(k6vnUA&_xS%)m^3ClrCDjRqUdxc4wE}NLNytQkS8jP^#92ViziiBK-pt z5fL#l#pnqls38!Mj1!Z|VNHBtPOu19SqNp z*{62K9x}$BVc-ys+>GOeF`SEZ-h}(y`sC^E?(Q5L8+$uFJ^f*Fa#UEe*!w@t`D0P%f82(=-qS0k*fd7iVT>zF_8~R%_sUx}wqOa~wjt7~~!S3$vBJ!P~P^dqX$v~k{ zKt_jJtwwwPjs1IbbadpyUV8t8L+?_F_`1R+k%)0}Boev5zrX+T;NZZUjKxQ9S;`}QNZVK}HbQ(lorY{q1fi&btZ5%Pj{A!BwQX!{ z+{~0)!amr#1y0QYqSe|>!o*pFrMIKAEyu2ix zS0^SWx^B7VD|(>^`!!Dt&?vn_tX#SDf(uB=lPLDA~A&DUO)L1 fbMYVG-@|&qSne)kaEGzMwtweZJy8zj5<~1?PY;oi literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/cdrom_empty_active.ico b/src/WIN/ICONS/cdrom_empty_active.ico new file mode 100644 index 0000000000000000000000000000000000000000..87948abe063c5f0858cc6a98508c2d91e8654b7b GIT binary patch literal 1150 zcmah}Ur19?96p!a5=!%_2T3U(LLZ`6#U6Sp1fj=3q$i73`8XOv<-bT-kcv`B2uXoH zh=}E|HvNqurZSt1%`KhN{kgk$yPJ3a{k!%1T~SPe&iL-R=j?pv{Lc4%T*f&3m6R}i zUS*F97`x0Et3==w&K%8S#~A)+E5*9mr%d3d#&+X|{meGbsL2>?XcmufJ}$+b8$;_Z2Sj zXrEXt2H}VV+-E#{lI2xXs(j&8VZPv7fihNqQYVmJ004cop7?}pHVg5196~}E+&%$H zhp%KSzE=)#Mk7%W1ObA< zAn-g7ln*?=ITQ+kKfo(ok063S%=e-1I;_8CYip|m@AM>{PLCrLUC9^PhcY%XF>#AL z@{1Dqu=hzk1V!IWG$MXT$nh8HRJwh4cX#yg@KEuVydjNHGXv#RtJSL3J)RLkmO+ps z5RM5D3x_~P9paJqnAxXsPY-IupxGgkoJ>3Jw4UOywg2q zp%(QTAr7slx(W1-d7MQb`zY(DIcMKV57HEK)9iA&Ivoy2o5f;jqMYJd`~v*lWR9^- WoB~8E;(x6b*TXsFoM%kF#MmEsxQzP% literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/cdrom_scsi.ico b/src/WIN/ICONS/cdrom_scsi.ico deleted file mode 100644 index 50111bc5a5045a9dbb24c1db965d81bd5305c742..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmaJ=OH30{6n#V&8W$25u3ftGvm&q{6k5Q-!o);KS+J8BVlV~>iHk;2(48a{5EH;4 z$hV*Z8bhG8K*0X|w9^72v=nOjltDlkogD9*T5P16$({G+^`3Ljz3-H<1bPw^8NJW2 zqN9wRW{jPspd&hooYTS>{dVd^B$V$suh!(`^G3DWFkVvPu~t>?TkqZ3vy|QvdNVU? zpQogpivv-PI+K!)_i42ap5|s*n)L!xCScA6%uEBqB&7Fa5NaOE#;mNmrqtA9u{<0* zq|=$U+-_iV9as+m(_?`5-2omhGw^W~;@d8H@XFbE`v+S>usYee<)`W!D=jObRWYR4-oyjb-E!7sof@wlwO$S|a*?O3%tl=#uo zMrQ*`|4}@wgD_t!6l~R15<B?Uo75QTKwHs zegA)W$AC`f{3pJwcz3+KZ04YTfO_|lhRF#8ynTZS3VD8rrKb>dBbC? r)bCmE>h~?h*S*G!3`37bbLjuOd6KcwBaG=2A`#0KZy(L$7>@k~?+4Mi diff --git a/src/WIN/ICONS/cdrom_scsi_active.ico b/src/WIN/ICONS/cdrom_scsi_active.ico deleted file mode 100644 index d51e28c82c00e7c1d5b97ac33b4aefbf8b63fa36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmaJwO)D@Kco?1rk!J;THMyZVwlwkHKwHP<`y zT(W){q}|f#yt=&fNP0(1%<&$Hq}JZt91hJofQb>nWdxj)u#C4urk6oxjsShkSpBlkUz!7^#`ojTl|kk%IiPVvnQKy~roITdY{0Y$FjKra z7vNu`cZ%Qo8c-@>8GI?$?=0HqQ~i(guV_Zg%NXDoDd7pLt2n~0kJ1OCL zXJX<7d%fZZyz{^^`FQB$cgM9BNy|<7c$TO?E5ORK_--15OL`^T9ewwWfnkz!kVnR=9N)6}oCCqQ;wUOWq&Cpjrut~l_@(t1) zY>=jp^mev@?JWdtRt#olYMbKXj)`n>=Ni4~m+Ndz4dD=vy&WV3NRPBAuaM6RTT64e zHzT9wPi~|R?}z$QvO-sU%WkZc?;0M+_wAK7A`uI^!KcmaCL0EmImeJ#eRMvm`y(NOhzA!-Z<^=oMWT+E-Dk= z$67dS8oPC%lmi+nuv-GOB8;7FXsho`#p{{c7<+iZ;YlmG>Dj<~PpbiX7wC2XH4oIu zJ>o;-`CATpHg2Zb-`sxQ0^&Ozo zKIZT5F<f-oG;CJY+vcLj!6RpvruEyLOBU&(SYHEDGc^ti`Th=9he znk>9r$f45&+6{7L9L_A4g%SCTj;dNP!V%u3to|K7Drw~Bo@LdQ<-=e6)^}i^vyaCt zUMk>Erk~6zGLBUX=Xa7{4n6Pvhp(h&1DpTg>xG5T_Hlmp-ee6W?)!B81@>R#K9Bmh z>wlWz?xu}q-L(2|at0D|hKzw&jCB(w@|v7cgZFaIg%pfj0tt_6GVXTW(mt&jXmejJ z`m|`}?wnW+*3;VOd|Ni;_ev4kV#rL4k6C)&q;B;JcPDk%r3O0mwLo7PvrVg0TV1Km zE_ziJiq}2uXxP&4jDNjXqlWtQ>mBK^NB;xH{K0sK17I+K)M+{}vvyLy&O5N_^ZK>$ zhG|Iufo?;_V_gQdsYSx3;+vR0&2{RKR?Z{ob^G$c`7QPBn|^ue^&me#ms33BzJ$kp a=KXD57Gmw35O;@cIR6WOvyPwSNbXOZJ~hq& diff --git a/src/WIN/ICONS/cdrom_scsi_empty_active.ico b/src/WIN/ICONS/cdrom_scsi_empty_active.ico deleted file mode 100644 index 36ac042d0ec8d0d00ac8d0c71d770daf55e10428..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmah}-%nCu82(&c)Vj!Sy6&>Oe*7K%6LK1JYi-@MHk+H9H|0`cC>cU}W3v%dChFR9 zI31)2=L~X)pl~2LBohyTAnvfI_d7=eb2Hd;KE99ldEWPX-)D!h4*GU>GJ4)(-Ip1= z$r!s$pd&gl&S_zc{=0F_fWD`P*=#<8;K0kf5v#?Xa=+iqEchCk`PrkS*Bzf6?e&?x zLQ0qwVDg%NbUC^nv~xoPFRqFswl_*3(A4${Kso^wWneE2DY^h*MSvi-f%aW4LxXc; zF6UBR$pf`2P^|!R5-6l~e*a?sS?-CB$zxjPHBjDhgL`Q3xrUM>?C5-9j`HsIp4XuB zux03eVewlNg`YsB+~ObX1H0R;{F!GEcAlQm=ypGhh&JnMt*8L`ERdso`+J5)miB9_ zKxhrp>Wp#!ttTx$-G5^Axi9t6n?R)ml#9gWI@Gg799r-@DzdCY3j`qrKcVMq4|x9{ zeRvEh{29rq$+)~QfBcuP{sIoD_v;~@7j-%!v9~Uf>*%%Y(oAx3AiF_`A>(;h{|{e` zx}4Gl{94NE*=psdyO*ej^!B;>k)nC#X`XHQlT#BLG`lgaRA}n=FHsLTcn?Vfp%B$g zNE5F_Ju1>U?{g{&EfGf8IyAa&8M>z|`!$qlUMj_?wDQ@VY89y-^?>@T8sNXP+fZgb z&G7Kx9qu2Ad|S)X?6~i$Y!MzS*Eo{-l}qMR#DH%5N(#RQ~&G!9d|6%^W>o; zimRXauuk!Zr1_iljvGLu0q)b7bKJi&`0C0jpRZg)vfCU=V5Onjwh* diff --git a/src/WIN/ICONS/display.ico b/src/WIN/ICONS/display.ico new file mode 100644 index 0000000000000000000000000000000000000000..ae0e1f8612c4e6613a1d70644bc145c06f2f4304 GIT binary patch literal 1150 zcma))Z%k8H7{>256TfVWWYK+D7B@B7vcxT!lVqFG`TqmX%&;+Mh|MfA!6=9dgDKa7 zldcpDtXQ-ahHYr8bPiX#s--RVAGO5`v=!Q>TqtJk8gW2iT?;-ty{;cjwq@_lbI!T% zo8NQJx%Z{0XUMZ`8AZmG)K^O=Y6V46ZxE3b$vnxEiK0l&^6C?D@Bednul(hL?DALS z*;Pd6R?71gpJ@2X{I2XHFRu9~3!0{%RVtNP5{cybbe(r$cSo_J5Vf~!QEEMj_P~$0 z&YH0PMAn83FBA%2P^;CKjYebK>2$*5@xbkN!)CKBR4dA+bA;QF%g=?NTZlH33Oy5! zr+Bm39GIS-#?;glqR}YA;V?p>5LlK)i$R24;_avr*Fb9Qz|S5ddLmErTCG+TkH;UU znaRmX%*@PiUJS#a)!2x#`W>k5Ka1~%e?ZGkvb#V34yB~f}u93{JqfIjaXNb^+6($h|NBX;ZbxP4}WD5i-Zv! z4*&OU^Sd2@8Dk5`xq8{ z1aIvY44v5ok>m?h`RypQmV;(4p*46Ds&GHF0fysKsZ{cA^D*diSD=^o8mx!jgyYCs z&MQ6FiFf1F=pB?;8*$oT;rLG03N>rt_#_Ft_%O6vm!fCSOE7=A3bx|6;5_;^?1$Il z>Ny^yb@^x(qK)zqfDk_40&vLlR-UV~&LwIX8!}skr z?hg7^8hR;>?uH6<(naX+>xIMNctCpWCiy>Ig#WXT{v593>$rOd8gek!l8cFpd0;Pm zieTd|&c}UnJxsjU5p>*!%jME*G@8{qoo*-L6BfZfvhM~2#5st__To2H0j9J?h^r4` z^7207@iB(zjp*aALDbt1(o?2P-~U0vt5d*r{ty^RF}$);jC52W*!c}c6&3KwkKrE4 z-)-Q-)_4@ZKL}%BVBl7UCudR4&(EiAlK-Z;xw+)*>}-r2M!30>zw>$p8QV literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/floppy_35.ico b/src/WIN/ICONS/floppy_35.ico new file mode 100644 index 0000000000000000000000000000000000000000..38eade5ec8e047c820da4652e07910dedaa71362 GIT binary patch literal 1150 zcmbW1>u(fQ7>9?%KY&m8O^rdLAzm5-2}(^#JM`AKm+Q^Tviv8XoLAWK)+-6+$1)Nzlhtlg+%#!8>)gb(1YPVg#7NSp5Api=+4bV{R5=Mw~2@UV+9up3N{25I|Z7GkxHW8 z{$23Z$SYqH{8IFDB}7LCN&k<{_(m;XlSS7t3ktG`Mn&QKeK^JlQ;XFJ+J9&_N-XGCTl*Xf6{jqqw7oLqNSeR z^|=_Q))Mo1NrVC@;UH>s9Cb2`Cj7OTI7wy3Qc6wO^E;yd&Pu`OT73H3LbRrBD6JJJ zZM#wBy{PS#;*P3Ne?5TObqLLM7_Iv#$=~Y4*{d-+b|bIKvv|HPfVw=i9WN8#l~45h z?S#(kByhHZyN#dY`(Y2hb9?bQ_c46@BWNzexKx4cSZ4DLE8u80iPC2XR+SJ6++$*5 zVpgGGkf8q#q46=i&Kmf63r71+!7sP@`g}ON7^QpxftoGW-tj4>ap?|K@ zf3_OVZ^DpwAQ!)G^T%?bW+7Td7WZmD!SC&7WN>g+LrtggtbCT6t`7RY+Xv2#7;W2; zSFiB&ewYWf*>Et6vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NJAW=YF}wU;ICR z)h(j%JfJ!i*Yp3`bk6<&nIW#-^uM(A^#6D7-Vu%MV{ZIs)w%c|q@Pjq^8bR?dqnF6 z*)yu2+TnMXqVN~By7u28_Bv76KIZy=4ufkb@z1Dr<39*1*dPDz9k&$)JB4rgZy&Pd zzh}&r|B4RB!0JG1k<$-MziZ^S|4ZjjLBYD72f=!pTW9_Eh}kym^s{K4{llVt@jnPV shp+!XXIc*m?(OdV-`>{uf5zmV|L&3N!RkP2*|bj|0_8top+OM_0PEwnAOHXW diff --git a/src/WIN/ICONS/floppy_35_1dd_active.ico b/src/WIN/ICONS/floppy_35_1dd_active.ico deleted file mode 100644 index b6728029a9761eb6b6871c6bd3ba8ef3c1d3b09b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NJAW=YF}wU;ICR z)h)cZcj>nOIqS;)CvQpqA2Fxozmo5oUm!EYwVVEzwx0g~?%g|__{jAm|C5g-|4%-T zgn|6TxrsiEnwS3arMqrYfv(f{NJ z<^PlKm7X(-LE%q~`_bdZ zKIX=MR-KDT`tRZme?t02t*-rdh`mk}wvV~~pTpo9iv5gQH~xdLg8lLT-f>$|uv7S! z|MnqU{(Hu3`LF1346F{M7TNtU{jQPQ{x6+B1qJJR9t7)YZk_etBWByM)6b%H_798p z#s47e9KQbloM}BMxVO9ae|uZs{~42e{<}x62de|AWz#-=2$X(+g$8y25+?!!09%f# AH~;_u diff --git a/src/WIN/ICONS/floppy_35_1dd_empty.ico b/src/WIN/ICONS/floppy_35_1dd_empty.ico deleted file mode 100644 index 4299c47edd659c41418365a10238c5f7eeee34dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NIdJ4}bN~efeB?moHz4#yzv2|Ie&_^dF=@z52=jm0MmD ztruj^sD5gP-z$p3zqsw`|K2&ziNf8pp8wCTe~J?S={3*)gK%Zn-T#y4UP8frGcW${ znSSa2q&b)VS9RS1s{^S;PCqdH6J}lhfAZKq6x=xBCRopwt%v_l1eyU;J6!Z<);#=3{r}*;UH>NnvYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NIdJ4}bN~efsoU~@&6fNBzkK-I5*KJz52=jm0Mop)C)4Vd0#WCUZ^=qYm*KWqd$2Y(B7xDm}UUQiO~XVW t&;37qU>6GBwR6}1ZCiK$Ke%t#|A|0(nA)t``-ed32Uuue2Ox1GFaSz(2Au!^ diff --git a/src/WIN/ICONS/floppy_35_2dd.ico b/src/WIN/ICONS/floppy_35_2dd.ico deleted file mode 100644 index 7957e2e2f6ed49d7cae273c37c6ee950a8c40685..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NFw?Y<_KN%ldzA z_j=;+uJ!-dlm!1@l5Fz>WJZps$^V^md;Y(B_l{`1qdoKgvQ*puApOfztp6Wh(nqvj zkUgXNsT+RB7LyqMZ5b%>x30kJ|8`)U5{p-7I-=-boo4eNgqP)c|6f{{jDivYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NFw?Y<_KN%ldzA z_jc$)m*Ik)HkyLaz!;v?6O{7*iT{6G0T z5(e@U=O+3rPqF@gd`TZpy&!X&_cf#Hg_@JJHt8@i`jfW-?R{E{X$DZ782w=TAC&)3 zzE_H32C??T{ePNK1GAiONk`~T9qWE8xpBIf_X@~Hny zY7+l1&-VeV1FJ=HKTQ9U>iGXl=TAYw%Zh`*dKOHm|GyMy223ro|6yW7QUBs(>p#m< zfMEy3^U7oX&zaVPf@k(O{h!fO|9|$B&j0f(;=t-aY8NHj90H{uV4;B>fW(Qw0LQDs A&;S4c diff --git a/src/WIN/ICONS/floppy_35_2dd_empty.ico b/src/WIN/ICONS/floppy_35_2dd_empty.ico deleted file mode 100644 index 732514db2776f340ecbfa97c7568dbb1c363d3dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NK5@cKy1ved+&4 z*Ul4-&#s;R|M=prA0RW9O>X^v^~kROU%q@H8eiS9^#92v-Ty)QPcH8IfA8dOqV8QS_f#+VvlVPp+K&|Kz5HDEQd=x&M!? zoAdwV#s&XRt(*c@2Ud%ee&G5y&i{Y%*gjOeW;$5UvAvssX3QUU`j0Q_`UA>CAbe!q r-2aCU>_WkZ_H6loaMz~)hxhIHe{?-Ce4uKNE$TW1%74H@gCYz7BHu5% diff --git a/src/WIN/ICONS/floppy_35_2dd_empty_active.ico b/src/WIN/ICONS/floppy_35_2dd_empty_active.ico deleted file mode 100644 index c3dd58afe91de52c0edf1015113c0b4bcb6ce0aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmds%K}!Nb6vrp%*2ONJJN9Av5;~Vaf(}L@rNO# zWCsh0pl{$wg4dgMF(*^DYrFhsnYZuve=~1~C1eHfK!D)5Np@BV*&u{$p)iDzNgN-9 z;Jfv;iQG93os2YoY^d=5+*_)arNLo60<=aUqJ`li9UF6xynGCOONY^Dv{25A1Jt5G zdo#j$Fd5utSqX;hY9Y&g<3?O$J)h8J$n?Y0I@bL-n)krCAKtD1b^vs^FL?N^?+m>C z5B9$KKkT3PfO|yssN4T=X%~u040!+jtpDe?={HqixsxgX>MZa79N)+a{6kTOr$)}V zy7^Oq@2V1Tv4RY&nh|7|lVEG-z$$6DFPyn~Ztl$br+g&^%r-=o5-ww3SJ5N&@A!@) reeyHFWobz;Z*)QJRt;|TDwswS?#kF7FV|M2Ha|c3)A;@3aUc2ugDDo< diff --git a/src/WIN/ICONS/floppy_35_2ed.ico b/src/WIN/ICONS/floppy_35_2ed.ico deleted file mode 100644 index 449d68203e8235eb32da724977e329b196ba5629..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NGVH#=lCtQvPq= zvzAD_=6`&p&wsBB;~yY1Y)FUX#p z>csypQO0EJFX>MH@0~@y{liZGG7{sjI|(KHB1)b9gTjPZ?4NIeqTf5m_&*3o6}$W| zYK%j{d9~5N_>TNv*bw_ay2KT%4y+z2{$Tp^>Z1NHoj(NyxA*k@ukW1jf9ABl{{;;( z!%u&P(I4+DVE6%Xc2)TQIn#Pj@U)2?|EEl7|37O=*Z*8#IKtF=WttoUvYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NGVH#=lCtQvPq= zvlcI&y=mJ2f{pqAleZ-QPh1-JKd{{K7sw17AA|ps7j*uA_wF4|eB}C(|H(&^|0kbE z!a#oF+(aMGETjL^mUrRQ3o^HPUo)y+s5wb%lMWN3KY1I_-lw&gW&p*B(GRx&LHYmW zd!;C55NrRDYf%5+DnRHb!T+Ez0GUy>s|pK?uY5mtBd--bp8|++}_jozrJ(A|C!VJ{ueaF3_txDMt{7sfZ+$k*;V2H r=S=HC!P6#o{GT$R{r{{fUH@}|;RsXfm1%MalzxDP26g}vCjtWi%}=Kl diff --git a/src/WIN/ICONS/floppy_35_2ed_empty.ico b/src/WIN/ICONS/floppy_35_2ed_empty.ico deleted file mode 100644 index 5801518ac4739ad8b0eb56e92801b2e63565a86b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmeH{&q~8U5XML7%}c%X?9oT_IV6R8scoZ|nzqK8v?XFR9=ayv4+#_$a_~}LB!^N8 zpR*~2rl%NhBFk@j;C~9BWe)Q8N(^gZ1cPkaqZ-IOMd3ieQ2&N zagWchv>eM6qo-@IZYA%yR4))L1hOnEjU{xchtzir1<}XP^rn4>wpLwlz3J!~|N5%_ zANtpSY(wVCax-le{O_4fNHpsTv)569$@2iFeT$hhhp998bNcRB*{JM=#IXBFBDX-~&k-_7C~_Znz5M=TIe-2%e#JLdWgB_` diff --git a/src/WIN/ICONS/floppy_35_2ed_empty_active.ico b/src/WIN/ICONS/floppy_35_2ed_empty_active.ico deleted file mode 100644 index 1bf18502296a65d371a5bcde4574773be2618b7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NDyPwEkMXW6}SM z*U#d`8;-91U%IX2fAW^(|2gZj{x>bG`UNthb8^%FeaCkE|MKMvPJH6_iT}w*lK&^4 zN5VjU;@m`^2}@i4A2@|yfAhX(RJ~AhlGY|2CPshqHlV#vYcb6LiW8$BZ2yDu|H=1C zQOqFL{u8&L{=Zd#&`*N@L17CrqiR$R31h6`=dL;M5 z^e^8y=l{uL`%v)qUAzBp+OhZlp#!`Buh=wq*y*3RxaH4eU|4|g()F|cA3m@P1s~YE f{r`R-KD>ViI2>VWf$@I`lzxDP26g}vCjtWi3||Fj diff --git a/src/WIN/ICONS/floppy_35_2hd.ico b/src/WIN/ICONS/floppy_35_2hd.ico deleted file mode 100644 index 36bbc5a2f005c4bf8d248465121ea3f639030d8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NI#)PQPl)^8at& zvXLmfZS#iznTe7ALw%fnfXr~RwfH}Ma{vE#@7@uO3vx34d%4*D2k8&>cKknQ`Xr+D zg6yd&&HEqj>pZ~vT?W{G>iK{6w235!e=bV+Cq)K;;{+5h#Ng;acNG1gxCG(ksDS?! z1!*X_C@bNAK}OvFvb>c4Dbayobujg?^aJCU<|h4LI)4fZ&PojbALirqe^Phj|ML74 zvh;(@$JCFAe?s=tSpT0ep!-0$Ff-x*oM}BMcye#^{|Q|U|7T9_{9l}%2v!GD8|veH M2o!$6LW3d<0I_PTIsgCw diff --git a/src/WIN/ICONS/floppy_35_2hd_active.ico b/src/WIN/ICONS/floppy_35_2hd_active.ico deleted file mode 100644 index a5849237d505c43a675ee1e1f23a51e681a760ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NI#)PQPl)^8at& zvJo$yyJqJ9f(`lqleZ-QPhObtKQhJp7sw1JTZ{kGC-?t<_wF4|eB}C(|H(&y`pzR^ zAU|<#qED!|;NQA1O@8YX6pBuNUR!vL+u5k&9Wbv#d=3TwsZI@aP}s=nK9l;I$w|LPZ+e-tRbOQRfSe22$}8%)hTE<&}=zhhfd*+2ei G{D~znwHLPl diff --git a/src/WIN/ICONS/floppy_35_2hd_empty_active.ico b/src/WIN/ICONS/floppy_35_2hd_empty_active.ico deleted file mode 100644 index 62527c89112ea9f3325fde31395aaf22255a5605..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NE+U_x;+iX666O zmoDJN8xOAkU%IvQfAW^(|G8^&{&!4k_ysbfx2ygCfqlFGfBEtSCq8le#Q)?Y$^Vnj zBViyvac-i|%*nm~4i=5>2>m4Z9~1^4Gpcq~fx|z0P454W>5czE;ZKbF(c@FTjJZIWO6#GGL0pW#nru|>Haxn^CwQT4%3OLHlW|{}0Um vl}i@@^U^L9yl?lG|9f_B`hRHO_W!GwEr9!f#^k<3pzs408rT6yoCpj6B`^WC diff --git a/src/WIN/ICONS/floppy_35_active.ico b/src/WIN/ICONS/floppy_35_active.ico new file mode 100644 index 0000000000000000000000000000000000000000..20b786f6c452c62a6c34057bcfa0254a8c7b5282 GIT binary patch literal 1150 zcmbW1YfM{Z9ET4JOGr%2G|No(K@Bo>S#U09OEkMcQ0E9S5~SONX-F7435mwBg>1N6 zFmp`YKuFny806x*Wdk}Wh?|9(qG;G4ZO3W`En}rnXiI@!Xip#Cw$er8Cv)<=m;Za7 z^ZUPFjwHp2XVof6jL%9R#Y@r}Ns?X^h?1y8>td25an}2El*nET-zGhEwj=E&ckA14 z1=|#gVEgXuM<~QvktN6umK41vC#jzdJvNZQb5~dMSzfZE?wK{2JsGcfyqAk`jOqz2 z&J$ReBj9!rblC|yrU=eX(lk^{oFNWrOp3AM_6j~J*f?_I-7WlCnTf+PLddfK3oe+O z0p}FVTEQ{N3*AXbzX|tWBwbkT*X3>}s4Bo|xkpH3EtUvR_V%V2k z@^C#6zH3_ayqp_$#a%q}Gz{01GnhlYxjsgE|1OT@CtD(Z(+A9j{cykHzRS5`7rz&R zL9UoCqtq*D7-^ttu$(S+0h+8G2Hn0CetR=l$|e9mcnbF=tGzJJlpl6Nse zz~_ms$NG_PlnFm2;)m)p@wXnrt1iXcaU7rKB)+aPd_SJX_tP1CH^0KKJ%_)qiltww zk+tQ>J;%{xr$&4(q(gNo{*sq*A5FvAa2R{j5vl)1htO7p z++B)B@p{x(?u4pscna5HJDrc+`jDBKnHYAP4Vz^Q`}7n>RRvr-fZTON_-{o0nlw1~ zD&FD^SSt=h-kr8uS!T4i8{MZ_+`s)h`sQ-DvL9Jff@b%dQU9A1sMw6ZbQ2FNKgMFz zGj1})xZm1{;hpEXtL;Jm-6>GzA$J@`vuCG4_kJo=ZiBO%So&fM1_W`hLvSZTs+7h#ku~v Njq49B{|El>{1>pT`q=;g literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/floppy_35_empty.ico b/src/WIN/ICONS/floppy_35_empty.ico new file mode 100644 index 0000000000000000000000000000000000000000..93de40cfd1c7495d598a1145f196d9a24db70b05 GIT binary patch literal 1150 zcmbW1TTc@~6vx-Z55SX;#z((|AH+9((-$91)CWV1N(>|llsgi&SPFs?B#=fals|1s zp)KX2v{c$|OSk1xw)DQe?CyBFOAAq-%;q;|=gj=(%+4gsaaZVRY2m27!QH#cao0GG zyGc-rGJ2i@$I;lzbseow&Gw_a_apt!Eujx@Z6UMS79JnFz)bIE6Vb@k$BFlYw$MP^ zrdmK*l?Y za{dggRwF84G?$Uf$knL#tCXj4RhG$5Ko!=(8{Zg{QwFHP*>j)fP>lCX6|BLQ7zPVXf-*dxl`nhA>H}#O;3w3uAm0TJ%sR)_Y(5TQ^)0t^^ zBG;f?CP(`}aDq4WYCiih3MFKP90ufw9Ww8L9CgwitwKI58&Hxy?d;T; z9sF3I?r)8N`TC$Ny+n1nALZReNPZiN0U#e(L2l1ZIFJiEklmUE3t6B>0p2{I`&YXEaSgW~Q&Zp(s{5XWgEaR~vbxSmUU7Qp-yP{Nu&zYNxmD gNQL*2;=}*sbkm8#_5zNrQ`VgqPj5H=1OFR;12_s;f&c&j literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/floppy_35_empty_active.ico b/src/WIN/ICONS/floppy_35_empty_active.ico new file mode 100644 index 0000000000000000000000000000000000000000..45eeef7b54d1856d6d7c33164ad5f88439314e4e GIT binary patch literal 1150 zcmbW1%TE(g6o&_b32IDOxez4=UGPu%4-j{{F}l!&iEdn&s4)hON{A*X6bgz21=@;M z4HB?HD&+@=yxQ`TmTJqiP>NVu`kp>!=6c$JqQ;e(eD};fcfND(%uR;l3g{{+;b=U{ zT`Jbz0~faqkEl((3&1- zE-oDZTpHPL*(;R~lqPOJI&GQ1a{h#;t>&ZXFd!KYK+2?v6r^+#a!P=lOb~H2z$ ziv^71xjcn4h3w|zQ-dqohX|QFkc@7DWimtxj9f-8BR5M~|B*O1N$y`9)0KvOdKF|x z&$dr4_1<-<2GuIiQtw`l?J?|O#fD;5^r0v>KhUu+?bA0vUg{=4^p{J$v-_ZWW!f^K zysw;{96y=oP|qP&(QQmGx6Qdsh0gH0_7JiOO8Rbk=&7J$FCPQ#oGAYFo}3 zbH44Z;_tlkcHgYaBoR!O(e|}%Nxh&>blN-Ry4l*8exhc9*EF>I^o@`gUn3O>A|u2h zQjHv`B%K4DMfOa@%%4QoA+L;q*EHsQw$K5|X@uwk#N`o){3t~C7(~w(h%4g|S0^EP zry;FbAo;A2y%UfZ7+x*^145CmbDL;{Iu1OmmNV+!nhFZm|&pD4by32eF+ zqOl6`sovbPiFh14guQO~`ZWmqHxRH-fPH%pnI8oI@~Prm8o{O>KteTQ=3YdD0YpQg zJYlB|f%Y2+dOZky9R+i|gS`9+d{;}m?~NMFTn{!`4QcElqSiia{a8on=g&L=mjeOg zD{Ok)2+RzD+4bZb$!~4<>gooWSp_zJ2hvm>BC`hgy{p(w@IU y`A@A?S5-lD4aKIr5u@J0xe@qX-{I$7|73G!46(TZY#8;%`Fpp{?EDA*H~s>Msvk!H literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/floppy_525.ico b/src/WIN/ICONS/floppy_525.ico new file mode 100644 index 0000000000000000000000000000000000000000..81fc78571dbb10e82661a3038549c837358d3d8e GIT binary patch literal 1150 zcma)*%}ZiY7{;$Ke?Y5Q4zry9CJ5TJk#>U-AxMar9|&q-2_nHX1Zr4mh77uJBO;W9 z3+>C#MM%?!9yQU*>7HhK=Y3CeXKpihG0JnV_dVzN-N*BuBS|{^PE1I6eJ_1{BS~*1 zN&0}o5>{U7c#|X?%fEY(c*cv_Y_3M5(b3k{meBV0_K38zvm+FX#YT$a@%TusU@+KT zU0r3hS`EIoT5x@N3GJ&Z=-k`@Yqz1x7<9W`==FL+^qbVex#e;h_V)H! zWHJe4%V7($^Clu9KyIXMw)r)H4fXf!fh zU&`_i!{hM)_E+>)i-BiEURYRQkw^rHfxK6YrKKgn^92V72bv7>&&|!Tjg1Y^VyvvJ zfY<94z13piIhCvYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NL!%Z~j|Hf55;t z(Qn_`2Os!vAGqbeQ`FOUwoz~Y+eN)XQ}^}{HoY)0N00LVcCM*tdNA#RsYj;=TE9ck z_Wut4E6H;|Fud%8b^ya~fB*jf$B!TX5AELl-`T7Ezb#N4J&dvO?ZYnrpFVBc|8L*Ef$`q$ z+x|NQtRhM;*u1Fs|J?(6|Ie5@_5YGNbN&Ygmjc7!1@Zc!>Cry)+<*I!WB;vzVTsM1 zATj6ISO434?~sMPQr?^mOuGO7_1!yU;n?CgHv*C#{(o`v23a^f|IPmZp#7H~J|YVT z7rg!Nop}3?&GZ}pZDs)R%$o>2>(+l;Fuo0@?dIJ1Z#x@^K{S-@ne*&FtQ;Vh1_0qG By?_7! diff --git a/src/WIN/ICONS/floppy_525_1dd_active.ico b/src/WIN/ICONS/floppy_525_1dd_active.ico deleted file mode 100644 index 71ba656cbf4b38690a30948bb66f726c15c97799..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmbW1%S!@L6vl7Ru1#%Px9opV8!IwlMraR= z=(Ve$Hdgj9D5BI_sf*z2G&)#mA;a*yXU;c#=iGZ3E@K7s6c;mE%UEwAW2KC-a)KmM zQaT03=vzrq3NfdJ>xe*Me$PT_j>b5{9yt95s!WeDt^EKU3q#;Hc$nvhp>Z6MC;E}g zD`}Nl0Tnep&^V94AM)VOzCpRB@2f_3Z%LEuWPSoi^EU zz|D_EbhjsqXUOU!6#cEobr+I8oQsPZ?&R0puX?fF3rIW1b2)#-|MdNP{(c#; z*Xqby7Dl6yN3Fcv9HQDg;>j%Xxg2f^1qg9Y{Riva{|02uhAdt&ou%LIKP%=CnQS{0 zi6iGuO?BXO+M!6DIW_gLi$Svy3M1`cdVjs!4TU&$v3Jm#@T&$qa!qg_l0~}J!c2#jVUEu0zcWzLM5ML|*4CZfQFj%iUwXqjOT zBEhH(d(9Lm!q;^sX~dXf7=HKMb1vt6_kN2Zq>X-^orJDEq_3TjZbC>eg_dZ=sMA0Q zJ?rW)&~v&70To>EvlUr;7Q_n({!@76muFT!K!4Z?W{aV51ng`I?toVNwfB3TXJP~V z_#)W36qqCfCT)V|Y%tZTYr0FL-xYN=_kPcDtd9MwpV_9mccZN{Xx;MuGg)|iN6__e zhr!$oHO;WncS{=e?u?QKEAJWaza0GOw|c*_J^LJK9y_{T2u4>`7+)f?rjlR tQBl_~mdmyfmo-e!J=VDBJ#=CZ;7sre&6P*gBd?TNm|A*8<3C_GegTKsC&vH) diff --git a/src/WIN/ICONS/floppy_525_2dd.ico b/src/WIN/ICONS/floppy_525_2dd.ico deleted file mode 100644 index b08b379c4a17f36b2f3ccddf25b1e741fc5e158b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NLV8P5!U5G{l09 z-c7MK{oie4{(qg7@w;`_#z5K#6FNHT3&dc$ulIj$Zx0ZIXb5|Gp!a`RIY2HA088j{XFwbccr{#e%4!mF>xKBxH*t&MQ4+aMeXaQSTztwv(hpM}{> zzJUe~W`iDLFAw2DfN-5B+KX1cK;2v~{onlPlI17+oo95>@-JRErn;|F@*LzB>wliB z#k8&t>H1F-5FW>V<18A5!)nHY#RzBq z{4IaaF2HFJ3I>r(CXq^|a2|_cM6ZRPeEE6RGB2c6LtI@&B9Tbz?Bp0TGzU2=y(>8{ z^*`2Rz}m_RHUk0JP3_n&_>B?I$@y%Z4eD3qY9P%r>-~-gd_68F#}(2B?EnA( diff --git a/src/WIN/ICONS/floppy_525_2dd_empty.ico b/src/WIN/ICONS/floppy_525_2dd_empty.ico deleted file mode 100644 index 00feded422aae4862f547091f48ce6fb987a2442..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmc(f(M!Tm6vl7RTQBy~bC3OL{UK9pS0pnkjb4JLL_Gw>rb5nUfueIJlR-TOMWGNq zZ3tiIP6o-Q#$ICl?%BS3zRNx5z!+PhCy`*ZZnEuF#x@vZTLej@Omzy3(cb#n6#tu+ z9#6vLQi!fBjqi908c)NNlVdZJM3?erkflkKH_*=bE(%-@ogM5ii~sGf$tm23`Xl)b*@WkLKF`A;F8B`aBW6u= z4%PQST0__2x~`8i7~pnJAENx?{+C&fM!k-fVc;jnTP*D20ea+r9gSk~R6Il{$0v%aLeVsoDwP?OY87R|kF^>~ P^!}UnaUQ{cAa48tU>FiL diff --git a/src/WIN/ICONS/floppy_525_2dd_empty_active.ico b/src/WIN/ICONS/floppy_525_2dd_empty_active.ico deleted file mode 100644 index c0e50f4c0e9392daf753d40e8f430adfb5633337..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmbVMO-lk%6n#OvHnnNpvi~(3DS{S8V6-x|d|{xQiRieV?&CA#4wz>^UmCJ?%ewx!`KL2eMvXr@9Rr5PSmpGyDt^MCpw{R^#sYZJHSGV0YTvYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NID!&VRyvo&RIO z??OBs{|9+E{*U!_eis2$6N#oS($5u}KDd~dv%`N^CkHqmiye67K>A$|NHmv|9|}W@&C~7-T(bv9R7!R5$BFDpt|YPrv3l+?Hd^H-M;OAASvMhbZ3y4 z>;D;3r~Y3uXU_i!e_x{AjvP)Pe}n?lAU=P`2Dty9*4984PLA+Dn;GW&|MlHFWZ~lU z_!}8O{V#6bAPeWEME_3*>c8~x5m`7pHTHjUsLvnwNfZ8qu*c+y2s~xde~&4X;n;K9 Wl>eSnffz(X*$Ih}|6%0-xikQy3{hqP diff --git a/src/WIN/ICONS/floppy_525_2hd_active.ico b/src/WIN/ICONS/floppy_525_2hd_active.ico deleted file mode 100644 index d865b19bd8ec5b1e147e4e5feb4a7c08fe9cb98b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmbW1OG^S#6vuDSu8nP4x9ns1NPLZ2mXC1|t*dDS5k#~KTD2}8lMAs;U%&_h#Z9!0 zpp`{M1wjzFR2RX&Gul|`Fvc+a?wND${hxEs<<2lRL66DAXq;u4NycUvV{-(BDAJFU zVT|Ucr~34K8brbN8TQ(sL2KD%LBMH2%xh~&Ndbv+4E&t;Y?OS_XV=mVVs4umcB>iD zH39sJgWvpu{AfxTtktLwML$pacv1SR{mv7YrGM#pmFm9jjpm@ZR$Vo=M7=LKEdBb= zyWmede{$&77pze9i-ef+^!vZx`qAt4Puif*gR@Enjam(>Vi+R#jGVu^&tV&KTX0e? zqtof2+wJ1AUWb3)jAge~w_i0+h}Ip;GTQBSkH$q6i*yd^{8&r-54i0p7792ml@RfJ z5vJH!-OxQ$`Uuh;)YHZm9FPz84Z$P+>-CTqACC`)*iOfr8PdPsH4U+ul#nLL_O0GxaQL5 zCN#`X90SL;fsmVXK{>&XJi#rUZ>8C$fhM7;T}hLE(>SV>t9!?P{c`Odp{u<~ll!&u zyML=8y*_vGFd8A7Owc(M@To?rYtQO?kCb~m9HJ-+#p85}R?~ny&rN-+dCKdjDe^p5 zWaBYBtD={BS8I1I^pga4g8_uctM|VCjmdqZ{r_#ts8{sVR62Q?@A AY5)KL diff --git a/src/WIN/ICONS/floppy_525_2hd_empty_active.ico b/src/WIN/ICONS/floppy_525_2hd_empty_active.ico deleted file mode 100644 index 30c65587e791f8af4e387eade944ef7597df4738..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmbW1!ArtW9LHbKt&3ecckKV#rO2pD1VW&AS0XYzBGl=p4-{~n|}M(60Y+>(B2}zv)%wI3DVCw3|)j4m9d_5P|D}-T$)<_uj-8+!jRutHj9z+otM+&lm2w%k)haYawlvqAPG^wnP^tfR zKOD~}GKvJ_>f94~Epb=SWc+-6dZJj!woU){$Gay^4>LF-|7)k?iDUBTRe2zlO0du= aPEyiIw}}~L#B?229NuShX^j2@UgIwull2_{ diff --git a/src/WIN/ICONS/floppy_525_2qd.ico b/src/WIN/ICONS/floppy_525_2qd.ico deleted file mode 100644 index e3f370d93ce21a6289f50d7aa5834cd903b9c745..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYHQxgi+L2NG6lGyj_@&%(gw z$}`{DXf^(~(W(A#r#j`Gh4PI5mMYWH)Xn&VO)pH$-Yn+7tz|Hp9!$Gn>e1l^1r#tR1(dY`QO_q_5Y@g8~^X!wd;ReNYZ}`)rtSjmC?f= zdstd)bo`$`Z{Gj!-@pI=@#Dw;L%VnXcQj7p~&4r7z^8HyT+TB@VKhP4zL6Kr8+QenaS7Db(Zu>DKUk99|h@}+= zxk@=9gi=a5?(RW7UNZ)3*S4nV_ka68)APK&Z__XqM^9oRqceqd$1|497|S9^B1P7z zFh=i^5@e)19oh^LC8-Nxl%|TWT+Rfzyb+Y8J710F8MFvi@Vh)(JXRRYv*Z!pB6$_9 zyrdO+O(P67v*1s8@aI3EyP@hMBfPhwDSrF0J=FV|(>&i7lb`oe->0$g4APZekt&xv z3VneMQvdrw@OQS5jOhIZaJggP@`qroo|fmo?*H~jonM5dvI{%g+c@(1(ALxeV~rid zzF}$q*3I6iyVGUOU}bq3fj|JkU=SyVho~s-gogA;bN<$}nRD>C-SGSU5=Z-9+QUFh zUO7vIQPTs#<-*$HA{xx?C{1(y!!LgmA9Luk9pn@K^p<6dnCjnBg{g4qtggs|m)jdv zG@CarE#!Z`x>QAD#Tsgh-MDyoR7HK|I;x7CZ`$!)NKEcQJ3&l(C3NJs(D^_JUt3%V z@aMdvYYcMQh=7e1u>~c23RP&2X_|owdT1Y;M0&z?XQw3sm%Dry7$UJuS-fc@PA9^;0`2-iQlZZva+Zl?p!^L(C$L#Vk1rutv^ zHCv;ZYcO4h>$*OUZO5zw!h7kDwvS Lg)V0QK+^FGum1t< diff --git a/src/WIN/ICONS/floppy_525_2qd_empty_active.ico b/src/WIN/ICONS/floppy_525_2qd_empty_active.ico deleted file mode 100644 index 34a6a377785bef50498333f95a772c59c7b0f4cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmbW1%}WAN6vbcAu1#%Px9tC#O(8)D5!IxbV@)$UW%NZvs5Q|-O42M^=)4rkMU+_~ z1<|4?iiBvT2&d;vmX=L148M1I_j1midl`n17WTBa6Lxlyo>oFS2_fAKmSPzr&jKN= z*3o95-`OFJQivmmO`t{D8HMcHhQcR`4q+X=8+LFp4n3+Jyr41-tu)sfe%{Fy$l@aS z2^CzL19wsfyYrr^N3-6IdUwLzsQvJ<1&98n=i;pI{pe2*mN)A!k3}GlhoSes9RznX z(BNU-pF-EWw%Gh@#{5_PUwYH|Ddv>-m* zqg*cQTwh*7@q|##o6TFRNsfI`O+%?v(kbNg`W|Zazaz!8sDdVw$fiJ@Hr{snzg#Io-Q3my%3FE5r@ jRI->A5|yb)4mvw$n5sjH=J84F9MU)Z-VAF00ju#HqYL^E diff --git a/src/WIN/ICONS/floppy_525_active.ico b/src/WIN/ICONS/floppy_525_active.ico new file mode 100644 index 0000000000000000000000000000000000000000..204053b3a258db554256adb687037841a3d32016 GIT binary patch literal 1150 zcmZvb-%DCy7{_0uAPAzXU34*K)V7QMk_dvJ8*ie!QA8La5ot=0MVTNHOf$-+Wd#zt z2tq>ox!4q{X?4+}^}~)W$%gBkR^L7EX*z3%!}q+r&pFTMectE$zKp5pDJx_2e#PDu zGWLQo_Lf8;iaf??V2r+nUp`8n)2p+yGv@Jl(q6Au*3{HgnrnJ`T9(h}OLJ*G+KhTd z{k!B#3DisK`*uhBFT35I7#+eh^lMoJv@tiR^IeFjO+Ujp^Zk{J^?(8de*rGPL<8D|!TQIsZ zin+Nt(O@tLp->3<49;q5YI6SdSk>6r_xo z_4W1E>>1H$G^W+nRqXHYKVk6vuC6X27z`qxVYON@FfediS663lXlO9d8Aq@5O%%v)K&tSN2wkL3c!KYikqSZZ|lCcuyF5y&iPGu(r0Q$l&=cEiHn} z<$@B!VzHpVzhCxNi9z>NByUd0L#d~yN1|FKI?odIUZQ&?kq?s1W|KxnMkI&BA<;S# a^+TewB~iWnzf{&^rBOvel~L)-zt|s=W9v}> literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/floppy_525_empty.ico b/src/WIN/ICONS/floppy_525_empty.ico new file mode 100644 index 0000000000000000000000000000000000000000..2b20861a30a76909577bfb2bfec01932fabd5682 GIT binary patch literal 1150 zcma)*ORv&U6opIT54a~YLVy6_ z{eFtLcCW==>_D2;)9#-2oyFO$qF8V|JSaH7RzAE?l$VO4yn#?c<*ANAQSdDC>Pgx? zPQhUCv0N^zl}hEAs@1A`uUf698kNmvf27lCF`Lb3y;{+Bv!NYpyQST3M|;+O|BqIf zJ06dzUatpIsg#&ZCbV0x>45o1%s(FvbUvNv=lM*R%Y}YH*X#AB1D@;tXf*oB*PG>% z_E`IW7)F0Q9{(~N4rw``YYfh@M}FoUkmZQAPRFB`=Zrj@iT@jC=KQf(O!WJGVg~2n zI`79~v7qU6s@>1Q=9(_9v)GUPqSx!uJ)=}Ag;Z7j=61Wkqc=fj7&*G1h(xE;AtQrX zE|=@`pB`JBPUok=V4(Sp4D>P(4u?g%-6kW0SvH&PqyCOK9FBL))HCP|_J=|t(Q38G z$iO>6$z(EMwOZfX?e@30SB+l%n*I2RMx#N^X7d??*W*mxZuhpQx=$b3@Avx!Mlxd* zi$!9MMk7-O`+Yv2!2XgMBauiD`m6QUjDhbX;PrY1dPQao^oH<#-Fkb^V86%X5rsm5 z%ozAKh%*>_Yh+-}0D9v@4`n10k;p3XK1=MqgjZtUWhRr6xm-@>^LdGNB=$pMEeS8r S^XNS`8!aeWzM4JxTl)>4IaAyK literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/floppy_525_empty_active.ico b/src/WIN/ICONS/floppy_525_empty_active.ico new file mode 100644 index 0000000000000000000000000000000000000000..71a2ef751a4daf659c95ffc5863505d7f4e6732b GIT binary patch literal 1150 zcmZuwO-~w86n$efF)oa&E?kgeV$y}b#P|2EU$S@IjJ;rt zy+U9JBM)&L7{hNN(*xRbeE9wTQnk!W-wPLRwv@o zXmoXJYl~l9UBS)uHB>7Vs1d4FsMTsvC)DdO7n@5+aY<#rSqELaUFsB{N=70PesOUD zwVNAg;QCu!-)uCXd3Oh`W)tr3@4@6TRapeN&oKOTxVpBswtRkm4wZ5l>X_R|L$YCR zCsTXm9<^8QRlC1;x99y|`db?t8=p>3PoZ2awl%1ZI@V7*4XouBYcbhO^&!`gIu;)5 zVDQ_ZI$|3suCK52LZJYpL3Pl-P(Mng5?o$hw&&A7rc>j}xVo5K>|iuJs?G*x6|A2h zA0NYWjd(mBkY#zw>2!WZZ~P0}3#s{^^EGSI`e$Z$rn00g{W?56^Z@|R<#M3cAgz^^ zm5+}eOAd$Q!^z1B6!9MkR3G8s;J_CQ26;A{1-%AoS*_Oh+8(jn?Qcj^<7*nk4+H`{ zlgWTy1NQ`k!(pGrVtH$`*H#Y(OZF_5^f#<{LcDp%x1x6a^4dD6ec>7#~ z_%4@=@9ph@kp`X(pc?ev>NPN@54~}qhawaT39MD%eiqn!fn0%o7dtyULQxbEi^T-y a5!erbxdd`)olEoBXp}H0O&ERo7yAnbY!{FK literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/floppy_disabled.ico b/src/WIN/ICONS/floppy_disabled.ico index 8203863cb49ec6b77a5a31cd049252d3c09d4c7c..7a0e1bb7c1b7c7feafad39399984a66e6acc3cdd 100644 GIT binary patch literal 1150 zcmaJ<+i%-+7}ag5JQd8t9L~NR zQ3XL@`@J5t;SergPGPDK|Kr+}gV&o?tCAM8O%wjLj^Jo4ewG!_&xiV%Oy+Ly=m`1= z|49N9{h0Em8c+-t<>6au2aQHB7s8Opjz-TPWnco=57r`IO=Hq*dSLWWKra^GYg}T0b~AK)c0u|nI)K^OVH!LLF;wh zx;V8tK6r}ujvu{74I0H|RkmFJ)IYXXtHIH5`RPTN(JRnXehk`&7<9WX`f?TBtz~qp zMQFKgSmjOEe<&1U%jGg0jrRHy?9>9R_?OT!chPOg=u&MQboOO*#J|v~mY@k6uu2cm z-2C+x0Jc~x!qJdcf50$$8~UR==T}fSEQ$2CgMQ-vPUWWWL!Rf^d_Ip8 z4JQs!6hU#hnypp~3ibDhW~4`RMt->2nGXhoY%Z6>tVW?wKqL}@BuQ>xW;I^q-=i-a z4s)?sj7uaE9L)olPN&^{cXyZD+uP$vkE8fF(&K1eH)s9V>2iWu`~RL#(d)nX2mD9# A-v9sr literal 1150 zcmbtSO-lk%6n#N!Yt>4kAR}noujn_V3n}Oi1TAabB0rEUFan{E@f#6A+vxZ)nu^#$ z3>S(10Y%7&I^FwfVltwE7|xsb?wxb)x%Z6_GxW^Q3tE@N?yL|CLWng2g(&h7rxP`-^zzpAJ%VTHf3RE9^dlypU;NTRit19C0xYleo?|Qx7T`(9N z8@=m$tFs(bd#S;i+uN6N9uCJ1{^EB!9nyZ08tj8TbKg8WzL&rFG#{`= zKA)Gp=rhsZMt&?7Lm&_^4WG~VWaKB4NwnK-(?}!|4+PZfb#%L3L?RIkheOlIX0xMk zI1JWcA9Vj1jYg)C$z;HMzV~!GE$eHVhDxP^QmF)0RZ%XNQ7jhazECKD@--dgw`Sxw z8V$5sEeW1C&y)GA%{90`z7Wra5N{bA z;>cB;7a@4B^y&)Izx&5MmVCr`!g$Jf_6M*Ld&oe}_0Q#U4O6L<5{t!_ySux~a5%gQ z1Oh9c&$r&$**W)kJZrbxy>dF8ONYbp)o!;dHk)l>wOZ#UlWBBtaIntj^K^K4NLcsx z_bHuDOC*y?ipS#=jYbJ}CXM;42Pwzsz_6bcddLfjMW?d?$_ zk&t}&*=$zEB9VyPXPt|3xx6eC3NjBlYHh6WQ5SmX12&&g)_?}%qTOy^9v>f5zuzaU zy8DvIClFAs-9f)5^Ypf?(gWDGs2KyQen4*KwVy=|k>_@4K_sre@-Cp4SQ zqz-IogRhvp>Y@cqfEmr$qEz2q6Mkq4-C!N*)wfQQ=r9?tpP?^Hfkezz?} zQGP8J3j*fzxtu5Z!8~qi@|_ypV^@)TSKKM7bS;Mnt KeC9700QWb=rg3fn literal 1150 zcmd6lxo#R!6oxNKI?IaXBDG6DgWL3UhzGFbq(Y)XbZG$rLI@!Qh<)G14o#|9!Y+{z z`wkBfr5HKR@%gWHBa$X%GNXU)%$f83=PpMG9p4uhf}dC7(_10l3n8vq9OB4poChKJ z-{sk>(1X%>s+KAlcer_-Tsw@ZyigDRB@l}aTl7K>83T#k@atJSDltx_V9kU1FHi!zyv zWZiDJtQU{R2@H7nalL_&DKbTCWJMa*4kPCr@A8IP02I63c!y$d-%V03P z>-YQL5m)svUkE<%J>^j!Jnzvry diff --git a/src/WIN/ICONS/hard_disk_active.ico b/src/WIN/ICONS/hard_disk_active.ico index e888fb45cbb1b5a7e8a71a78c4f72d6380b90cac..c2091e668eade317b77d41c17f59d898284ecf0a 100644 GIT binary patch literal 1150 zcmbW0%S&5P5XR@y1Z+XEP_jsCX61#3pEdn35bag zO01|5ZPG;)BwZzGVxDR=X+n%$SV43;-wjtp3VkH}&N(w@zBzN|-bDyUsTg6BGHRrKRfp{CsV0Zm#C_dQaSL_leW#tWQr*pH5Cr)(w8c zCGCjz7Huf&^769E!omXkd_GpZ3R8eszpCe^)h5<`(y4Zf zyM;rcP;G5(jjdKIPfbm+$KzqCg{3B5TwG+o-_J&ek=s|=xhK+djq#(AyX;+;;c&RN zv9Y1XL8G0G88&Jdo*CwW=m5L&u4}p@-8|wPIZq~&XW49)GnouyPN&n?zy~CT$G?oT zEo$T0#4L~PjZ|v+S$-xjk<5=fF5^{o`3J{?Y$>@vREuOsr?f1$H&L2 z4tD^^gB)6YdwY8fMn^|ipvBK*GCh(W*AWM_bD>9{G@!%TiA3U5?)|KxZjADrzg4T% zt4gK9pj=lGa( z;Sym%lLO-Wt@EOR)NQrDZM(Dv)hG|&Iqr4#?^|o_vluh+>*$E_`+fH0CS&&)V-L7^ zh(~sD{$Py1yL)RVvHpjf@=`I|%XUMpsbnwN4XpnbSK^9Uy;4bizbC#{qKet;^}dV8 z;<#L&d z#Ud371)*##DTI!~RG=)eE;C(rvodvQkfdj0c!KBw7icA(X2MVrk=Xt`Wc zv(qHE&THW3@7CO;ztK_WSDyd%WHO=Qa7g3vnAYpHU>1u7O{Y`g34iz@HW&=3+wD@n z-zR?FZ=Fu313ZL1*b9M$-)J=YA>=?DtYH}RnE$L+>z#JH{RwfI5A{Oufv@xckNn{I zIeoNPEVnU3{5xOlGdK&d(nHoFd3gAIzNnl(o6YtJJ%K?FvJdGa`#~MOUXMDR4sqt8 zn9pjpdhK$# c)L;4kwWdqP==9IoPfd&o-C*n$7tv1N0B)>V5C8xG diff --git a/src/WIN/ICONS/hard_disk_ide.ico b/src/WIN/ICONS/hard_disk_ide.ico deleted file mode 100644 index 91ded91a72627cb7909aa736c04645ed16031624..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmd5*J5Lm06g@;cW5kBq(!yV0YehvU=rtz13JF_SP{1PU8YLBgd1LxtG|!XC1&8H z^c0JXlIK2>7e+{1@3$yvC>CE(j&cQYr6*4hc_=P!(XjE)#!667aSTuXtSj#QRIeZ% zU$?Ja{-Jkrc@_D^N5c`UA4=}#Xf4F`8on0!i!a#PC$i&P7&)V!#8D5v53l3JURg^|-)zJ8JR#Tn&!i0ggDlc%_X?O$dW*F9FYRoWbEhO?k~&^&4`dw&rh@b>T1zXhmDz?V92DLt_ z8;K|g6|@Ak8YT4++Vr6jyHI>p47MKcna@cRx=>dV&Lnd)zjN;Was$-ZtF{()U5)0Y zz$yT1OjfdrtJ@o3->qEc6x{#A#q0L!BiAE2|Ax=VwMb6)e~WwlUcGg z*!joPakdU;)#p#kAKp7g?s!S=$&)sAz#X3=4~#oc`O8nW*bCBoN=8RXJMV{R>TDD* z=@~sMiIv~3R|`^x>S8yI7{B>o6E<#Jfx+*ys)u>%SCWr>Ll5!F53*A;U$CKZd9Xtr znN%gCvk)74guR5kJh1O}vb=u{vGtlsjAjVu2z|nN)W_Bwxpv6-hS<6?ufItD+X+1v zN^F=bPMKmQoX+PeSog85x6SroKG+5AgZ5E-dFeAT@JYY3+s_N{=dtCazli@&1>Oai S_;Yxo1_-nS7&6%@1o{O*%q4LE diff --git a/src/WIN/ICONS/hard_disk_mfm.ico b/src/WIN/ICONS/hard_disk_mfm.ico deleted file mode 100644 index ee44a85a07f989fe832a8f433a9fe9212858a57d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmd6l%S%>K6vg+UW)az>QS^m9Y!(DfoD@h7gd&QlfkY3?Bt$+!MC@T9_Ao1vAn8RI z4TS!IAc&y8O3TvJ(oz~VXebRXX215jheOt+VcpBR=iYtyT5IofwpsAItjzqm+Kw(Z zTVZA!93JvWjQe8d|CTR_$iM%C$C@gJ4z!ZhHk0iulI>~Y`|d{A(Ev4duQ2NQt*%95 zN91na75xsifjHtz=lF$~({UYyhW4mce+o8kho(;G>5rQ7mWPn)Xzq$R(owE_rLn&y z?}zg@m>Zphkq^J){WMH{ju`(0!{abC3NJ@~!R!3tn$Pr4@mFIoITJZ!Q}AXYYD!;v ziamb|PX?hh48GrkVeP~b@df25R}fcv@=TD2;^ICkK`4JwA6DI8)_ad{iYGtSD@Z5R zoobiA_`XN8wz6-jM$pf>e<4SEA#T!0wa8z5!T0`F8sAVDs8UbjsE5=?(nZ2{*(W&zQIiR+tnV-ax5}?>`1(y=3++7 diff --git a/src/WIN/ICONS/hard_disk_mfm_active.ico b/src/WIN/ICONS/hard_disk_mfm_active.ico deleted file mode 100644 index caf8ef5414c102514d9cb43868d586ada593a303..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmc(dPe>I}6voe`b`ja8Rb=#s+O=xaDv&nuYEc9&S~N41$@5Rocnl)aBSb6H5;s|C zh!tUIn=lB149iOEP5RV&me!(G%V_aP`#Rs;F1}ZbY8AsbGxyB>ednAzN5tq=RwjDi zC?{5mtP_##Dh+AG#`Phh-`1|Oir4>e^R9Ra|E`}4?gj9N{2bSRi+g=uA{Y%2WQ(M0 zug6PluE5061{98@Q8=7J;ZPkG57q$ttAM@7fIS{id%L!j{psWPCKr=ufcERa#Xg{= z8))hT8ajaRf>o*&2!=K9r>5UMG+xte*_{V$KEDwlL!LgT&H?p<^$0$M2_$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 diff --git a/src/WIN/ICONS/hard_disk_removable_scsi_active.ico b/src/WIN/ICONS/hard_disk_removable_scsi_active.ico deleted file mode 100644 index de29795390f51c819fdd6436ef59b97bc27c7450..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/src/WIN/ICONS/hard_disk_removable_scsi_empty_active.ico b/src/WIN/ICONS/hard_disk_removable_scsi_empty_active.ico deleted file mode 100644 index 8c08338ba50069a50b687c7cae2133063b3438f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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;s1Fr6um?3BD78GmaSUkE?N}Uu0@FyL_(lw|0G(G6iMQgmYS7hky(zZXf`$G z=v3NdIOESmqGhSoWTQ^m&n8?v%ue@w@`bf&S?_V)_uhT?oOAE@T@jbwiHV}m6|!rw z$Z`=`snC!{=Ht4E=)Yx4=3&17gU1%PCz5^5?;N<=>g>DH;_SKX`@Xxd9@D=ciWi;M)nS)Hqn>XFn)w3C#|@pT^+$$KUX3@-xQb zUk!#QKH*t3j>wxS^u3<^1+DXkYKHia@uzR&7@hiJI4@$;7 z;n5g$zx&tiEyyIFU=DK$a;Zm83wkh4Zs$-GYcuk)R;OenR0bk5j9Wj}OHjwwZEL4L z`MO8nR&Cm`lq0C;>{-a+UXW`wY%TOBpU}Opvg4bSnw89+$YBq*536JQVGZ3QF?f4l zLOE+JUsqS*tzeXS7UWuA^5{t}q38E}0oS~4JajHw=U|SrKyV&8m*-o1P<}7Wb2js- eGc>n;zdQX;{=fPLM2Np#`7RNIMIu3k<^2S`sXfR5 diff --git a/src/WIN/ICONS/hard_disk_rll_active.ico b/src/WIN/ICONS/hard_disk_rll_active.ico deleted file mode 100644 index 5692d2452e953c5a0ed40159464c925462508f66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmc(dK}-`-5Qbl)H)F($XOEsd=*@W07;n93NQ{XGw~K&U8$n4Uk=RIVG#Ukz2t+is zfQ{Hz3$&tA3XxJu4MqxTQ3{q)1@&S)G=k&&uRd+{pq|X;-`zL+zJF%kjt~aEii!l^ z*NgI%LaY-)Y+!MSBe^&~gy3&$SLGzv|8Ub?R*E?Lvm8~cp7%7=O(_`p|rfJc7td`_P>8uzWn4Do+<<})}8u*yT#qIh@| zpX+E<^S8OUYzKM*gC0~L%18BsI)+}R$UE|!nAxIuej3i)2_>;l39QNs4mrU>)|br;WpXGdBxHq)C{fJ%vmH%IB8W4hPf6i_*2qCpX Jh!Be?r*CIaPt5=T diff --git a/src/WIN/ICONS/hard_disk_scsi.ico b/src/WIN/ICONS/hard_disk_scsi.ico deleted file mode 100644 index 7a31cc1f12d4ff6d92cb99b566d2a5e64d6a7530..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmd6lJ5N+m6ot=3J7d6x+QddGds`bDD;pXU6QbDKX>jBbkPz_+0dZgk7-W!f2rsQ^ zfIi&eh=F2LTfuT-+|lB2h=wt z#!0wwE8+5$1^RL@ISo@Y@M0WBp2Khf@*@GcA$-ng5ej4QBolJ9);B=^K;SmE1izlA zAddLb8OVp6VhMyy7NphN2k9or4#M=ypeb*82(gaA;gBO8<;qtYT|MdtN)rccZNui) z@7Udg{m%hAyRg0it81{b`V+aK@1{BLzbU@94tx87v%LcwpMs|JrKi~P3cULOOUu}K zzvg1iRnM2ca+E8GD?NEe$U|{)7vIA93w4~Tu3+ZXS09gls#lOstUJ~&fAI@rU&<9# z$2EfXpYuLHar#(k_s{^ASirv5m-RG&HLdlE-I#6F@<>_;_xT!Og;jB_^fZB6lP zbn~!x<%=7A#gnJFLMHqE7p{M$w(h#kLD|oO=0WqQxty4S@k#yXFrURznVL(rfAas; V9_;)Lf4dq}&UqYhZq^WaKL7;`ZH@o{ diff --git a/src/WIN/ICONS/hard_disk_scsi_active.ico b/src/WIN/ICONS/hard_disk_scsi_active.ico deleted file mode 100644 index e7579fd8edc78ce85a17f4a08a03469231a6e4ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmc(dziU%b6vuDSO{8_{EV$Uo-POe*PA**>k_W9rC|Z!{5QrcYQR|ON#cG$Qyz>Licvd+(liKi_lCeaD!9T&=A}?)%Nj z-Nv*TV-AWWBoP~zhcWVP-ySP}{SUX$U?>=V6fS!Ok8nO**7e`wp>!zdz3}kf?U1ZP ziBOPpv9}D|uG2qI=lab$*ZMcFfPbAg3$=xJOPQz3I9_C^6 zJ`86eGisH*hgX!mwb<_-5+{+eZ2W@FcWV%Y@p<)0W$4NE;8mk|%V(NAA|nwPO2hPH zn^$vZ$E{o)>0wIAKK%YGr?z?NztnpcaueUEuEI*SS?e26`)swgPU-biqEDm-Isa%e zN@=F3b$*xpGb}E_d<7O3VWVc5)iqdJww~&*ej1ybhYufNb`Cl3HyrQi^m+BrJ-Sz= ztol_Jwxu~Vu59T&96i>>f%X;(#jk$c<&%0*sgL?P59Kw#^4ak(jh42(Iz#fGGyZpCrS(C}wL=RxOD=W=2S@{{_X?R-ASHRw3u{mTEZHP7Yzcj75FFZM`ZZv zqnY*c^PZSi%2O<|EX%ZVBn>X6tG$k#uqF-dUe-PL?z`7od!MsKTzZFuh(1FlVX?>x z5m~9wkVfX>x`^n%%waA;F7@bXK@Y~s^$#~8Dt)bcQ|#(x*Sm^;FmC-=FF_q!x2>K2 z?ZfKWepo~A2OpXT zZbCU>manVpVr%Am=2?(yeaWLIxrClya30sZ?(uH)=p4*&76{HG=d!B9i^`5OJZCeX eIzuzj+3OGf&0nZ*K!o_$mE#gISR~?8Sl%xcH7I%j diff --git a/src/WIN/ICONS/hard_disk_xtide_active.ico b/src/WIN/ICONS/hard_disk_xtide_active.ico deleted file mode 100644 index 806329fead54095cdcee3cc79e2393d6e47c3b8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmc(dOH30{6ozl3J7dI+YnLV_x->x(H7?YoBx*=}Ey#2buxY9Vv?!p}sFk1?jV?qB z0fG<}MAQNz%A*v5K!p^7M6fh-`s)R>#1Zn0}des_=IY89&|RP^`Utv&whuPCCet zr_Y)DE@anb!;H9LP98|`a8x@`)a*o6&smk1xi3A+SJHKqwC14jwjHYf@%=w}*?(r) z7F_K*@#X1E2xD&t5;XBXjL63^rDyMk(HOb`cay9^p1<4gM#EqY>-;M72S=v+F!Z_` z;ptvXei&8E_{%H|jycIv zC-3bI$Fb^lmv^m8&cPgKf#N)JF3SU6lm$-lKdbq?+~Ju^J+j99mH%IBbO-^@pR;=` NLMY7>qFoAz=^Hr#Kd=A* diff --git a/src/WIN/ICONS/network.ico b/src/WIN/ICONS/network.ico index b078387d39de419d0da0d3fb2c782e5da19eb1a0..39920c3cf93498af3cc37a0651101565a1f6be88 100644 GIT binary patch literal 1150 zcmai!Ur19?9LG--^eRMAWI9vGz^5>XET&nYZvJU4-CXWZjycmcH#YOn#NDA=I2N

Ri6}{_gMG-=Fh2_g+HI(4(M$ z(6fN(&k=Ho5K>M>UDR{vrx!x#+~=Z0@%Qv3kx0rP({ZD(&sbr%<7{2sYGq}mRV)_2 zk4B>hu~-bpH8V2D$+uKN|(|=Kfw5%$G959_noK4K&$_D>!LC~PHTUpVaT^|K1zw9w`J614 z?IqjOe1qk38r6tfpCW2%!8?NpA^jr+I;-K8-QpSkE1vb^?$=|U(;_*dLSj&km_>?+ zu?gXxdL)y{|JC1j4qMUzulGCczw~eMIsX@G{G_74h`$dZojRpI|F0JT literal 1150 zcmd6l-)mA~9LC?My9h=X(PfvxAZ%+nDycR`nof_KCx1+H&R?h0ETuWel5%OYcCm{_ zEgiGz%K1ClTp`TX59u}t0_h)!F8c$X-gAatv>PLWIDFoR^L(F&_vM_IkbU&&>LPSK zMz{ln93g}pr%;PJyFL{{=!X%dtajAquwm0KAUoBGBY1 zEsyt$(OfIf_hW^JKO|F3v)4AzR6L&e#>Aaq5*#D}6~wMf5WA)5_sDR@rx1K5;rvPG zO`e@MnR=`^3pQ?o>WLldXB0S|rI3=#E-hejcg*NTQhwc2AY%z%WW$Gtf(9y2p zg%9e88ET~ziwm=e-49}?mWAD-hs>>pA$1dDG&A+`FdqF3t{j4EGu(zzq1|A(=1P`_X{2`g-ied diff --git a/src/WIN/ICONS/network_active.ico b/src/WIN/ICONS/network_active.ico new file mode 100644 index 0000000000000000000000000000000000000000..2389fbe558913b8382fc04414fc6d79783db78b3 GIT binary patch literal 1150 zcmai!T}YEr7{`yMB#0sO!H}9xg;cx}gU~=t0zanNTBa_ynS!f1=f*a_Cc2?69E+`i z%I4JR)D0~OKd6fWA&MXkF9bv93cBdtt`z%s&TA7At@H9bAI~|@bDr}*@B0!GL7(_| zLhB@=h$7??Ata4LP1JH|rwt)=ZiRmcH>Q-R?4%%jM3oT36?GcR^GtIGs*UTU*;| zC=`MvXo3Ef9uXT6AR%%@==bsB%)CD zeUHH#<^2r%vzF%KVP|1|xm@0{xw(n$?QKN(=-vwi(aX_@S&l)}QWQ6i^TvTLJx{sF zu-R((bvrSqQ6han2Eolj;dWwT0zFjA zsi`UCig`#^UO>%S4Mx9?9#Q(a(D6~G zxq_T7K8$Y-7~2?wW=V;><}B`B6bi*6)gMf!k&zJ&ssoHhBW7l1An6yN%9Mo4u0)7h z6LDM1M~U(>?mo+@l+%HlNqmp{wLYEWR-)Bt~%4Abq^ znAC|et}cg1Sq#75|G)kB`#W{8XdBSiQitAVDa=g|V0u)IZhEfy`4^zyLgz`jGn-zo l@1l6(EwRZ) zbY^Z6$F?}N1{CNY0c(0&dTG5#%Y{pCOKp4GStz!pEf#`nbKCX1b1yFGgY({efA^l> zIiKJ8{eI^VvW31ob`WacCGBq!@(v;7eJbjro=rdf5JKnJotsj}Z#LU%YHI3RT3Rl( zwzl>)G&FQqS66E&vi;2%A+@!&`*b=T&v9INX=w?`WD=oJ2nM5BKGo4NUR71K>;GcZ z)zuv|8jZQNwKZfi87RCYN$>_FxTq|19D2U{Ciq{B;l1w}97pQ&wlk+o<7c``H?RMK z_4Re+^LeCFDFlN-*j*kBIA?IzZNmtA7tD|zUE0oZr54wbS~+XEjF;)>a8202vMeHz zh#Eu5!8b3$%DQmpkrDTpTVRLp;ECRZd$$KyF9E90y2E#rkmxJwrQEqH()F`a- z2&Xi_wF8j9-Hny+zrb_ar=)V{0s+`f!?4}{6;7KK>`*`4{pZ1){4}~rZd#SUx)(*= z2S{D{5>b8{QJ+s$m>GlrY!iHA_mTMX9R4wOf$MCND*4&t`%C2?Yf$=O4-!8ggO9br zKQ*OFoM7M`_ygY2Atd^>C=GXl>-sEE$&Vb`?ThI?FDHLGitvrEA&ibdu#COZD1?Vp oh5<-7EtduF0r8P2Zr9^4qB&8R$ zutX|BF-=UdH%)@9Fv*u%TAP+Hg@y~1?*Ff+~7Xpi09D&K%Y;oLnwCi=S+wG8* zR^h_OaqM{uBva1H&o0Cntyq1x4{Pd%5Z3I3ho^5^YM4MkT7F#>e+RmZbsj!ft%ceO z$i4u_yMeFt!@y7`Zn;+ zN^pUEtfD-A#h>CA=4hRN@Fi7V-U8$iA8T@eqkRuK`QTC>n;%)Rz0Hl~CO16sv&sji z^GfY~6n?Owka!vK7yIe#$jAEHLBuxMA@6fR^wEvT*Dm<$Z0@B;^R7?lyLzshkdTerfCO7QfTAdBA~Df8#R)}mNSsI< zaL8n$l7Zkxa1+Ft(oHEX+9uI1q<#CIPYlJCl-}^%``vFi_dVx5QOdwyNr~e9sj}Ww z>XB0F1>qEDF6Q}AifhRy7wGr@f8!U_9de&MBqBw4K<<&-jc7CqpU-!eOeT+Gu^1AG z1k&j=QmK?4GcHzFS0QT>KN5)`6bfN^c^Qj~i#qPa#KbB0AIIZy9g`Z-)zt;+1T}&h z(bCd_=H_NNolZ10HKDPw5q7&BUawa)o$l`Lo*f+>;qdSf2L}g5_V@R(x3{O^9_;Mw zV0(L8lg(x!Y;A3w^V@mJTM&I$nVXx_b&y)H&Ikko8mSBCa?Bw+GBTnyx3#sw?RIOe z4u?bQtgo*}ZEY>8tE*92S&52@3Qbj26`1eW($dmb8yg$HrM{Ar)Rvxsp26es=o+|O zE}gf;s;Q~b^z`(=YPEh~BN*tx>D1H|s0E{=qoD8T@9&4~q2F4Q)K2PFS68Rc)61V` zv-z$x5^L>UTU*l}(^E)3gM)+U>+92gh!^646g)He0h0Zp6rQFnM|hGJJL7OlhTjkfzc!^?{QgK*=t_!h4S+9cLHnl jR^Xb(VzIno-p{X||JQdwsgJj=ciLu9N=Wb@EXdhEhgT?T literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/removable_disk_active.ico b/src/WIN/ICONS/removable_disk_active.ico new file mode 100644 index 0000000000000000000000000000000000000000..f365dad9a110090cd808c02be4fa7b368882636f GIT binary patch literal 1150 zcmbV~+e?#i7{{NN97v>j5xWqPkS^5w{(x@9n-nkHtszUJ11J+kndY3jdD;}kvANBu z=v16-0}qoO7(*EDrU;KoH(eA)Y8IG&dw##+2b0Sjs&C4Sm?~*o) zNKHh=3~%vHdY?Z;d=@E8BiH{j*y*9NsU%ffs&VI3>xc(1v{sY})ZZmfn;fk7! z^oZWjCA}kDp`?_{l9wfq$HvA!c)i{)v$M0uQ&UsNlarGtPN(z4ZnvM>Y_?NAKUI6x z7qrRRYZN*Qe{5`Qd|p{uK`uw5t~1@wxb3aXGD%tlrq zORjTWxrjs}N2{x=2#3Rn#bSs?qjJu6vA(_zaaQ0cK#{))<%#kP`M!LV+Db3@{?Xdn z8rWZ0EEWt64Pjtl0DXOZFqur~>FGhWsT!Is4IGD#3}uNj=`3?ytT8JrTNb$Ax?xV5VT;<3N~O;E-zOq&K_C$LjfI5;nFo;z&NJrb z<|HC7ym##JcwRdk4(YSmY({TyFS@$A(An9E_V#wPwY8z8r3Fn*O=xUvL_3WHNa!^nVk_%*@P1MMcH^v^qWde7^Vb zcs$cPqHjb`ihdL|5c$5c&Axy7RV(Ifub{TJww|Bog1Wl8X9CXAQvshzYHDhpaNPH< W>;HF+2+`qRiuDSSAbcYYK=c!Lz$2Of literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/removable_disk_empty.ico b/src/WIN/ICONS/removable_disk_empty.ico new file mode 100644 index 0000000000000000000000000000000000000000..ff0f6dec4934184e17c26aba7b8c783ad61c59bb GIT binary patch literal 1150 zcmb`GNs5zE6op?@P!Y5o=s-anI&~?9x(B!5%tg2WNiqly3~4G!rSm4K^nKs=9U-J! zL3z%r{23Gqh4{kvH}B;h&TW3BO!%FhDO}&G&kvM(sg!yLu!WtQecY77S>(+P`u+c3 z?nCkscmke*=SQ9%_a5SY51dx9Sp3;;w=Y_)mZ#BZcd7uBM?fr7O`~{s; zZP7D9&vY$V1Ln`X4K3>N-05_F!XTJXZ=ca4dO_dC&|obMPpq4vf!_J8R_kL95^DX0 zy`l&9m>Q*0NeYF6_P}1ygOL-TvG4tPGXxl~Of~F5j z?aKocN?%j@Zt43S(nV<`xG?E>&cI9z!34d{Z|2@}`<f0JOLJ_!4>jFON@P5TZgtD{3$FL49rE!@`>zvUb^XMeawnkp-E&5;G zZr9anwUFM}>-A)KPI-WL zhS6vgkB*Ko5{cm2)>>&*T$MJO8!F3@Wy$C_CPt&txAAz4%-Px5jnIG46gQRD)9V-J zqIqIW8P7Mx&FpYE3{rhNeD1%&9w?B{sKCBZoIU@X&1Th_x!!|=0}O}5xVN{5JVK!m z27^KL`~B$i`D6lt0H4=kv)P^w27~XE2kG9BeV{wTWHKpx!5$nQ9^(G~zM6~k@xIgP zd_nyokl)^7v51_5YoU8rbFi06O@G!yed4oPt#?Te#=E7nt7&T)KvjG`#YHSk?< z4a%8#PB9Z}c~~r#nbXtLAnR{)4yrX|HkN^Yvr zsS2+ql<%R#;V`(}?&pll<&q(fo-wp1W4GH4bne;f`u|-^y8z8wir)zU4ANK5ND{zr DMDStI literal 0 HcmV?d00001 diff --git a/src/WIN/ICONS/video.ico b/src/WIN/ICONS/video.ico deleted file mode 100644 index 664132269defbc0de32deda9de676e20593d6435..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmb7@-%nCu7{`yR%`UxYT~;@3{rm@7_j=Q~;x3o6oapASm6M?es7W|m(A15ds7yoJz8(t99YG=RGD9(^}{3^FHUiXW!?2ejSc0p}VY%qxC8$ zJ&9+27yq<$3;{&1M@M9UYZhES3jGqw!vM zclQ;gQh9+SB`0LUYk7J3t(uyejLBqz$K%1o#0192#|yaK?gNLz@!f8>C&tFcW(kYg zY`)LLB9Z70X|t`Zt)TNTJw1)d$w|So=d*CRT)adgx!uvxk?rd0LQhW*C}#M4KFrV0 zBM=B67!01t+}s@B+}v#M?CgX}r4n#DomgC4L_8kH`uaN3=`>QQ6q3m#5{X0+3;qSZ zsj0~$m&>76t3mk)@rT1cIjZ7x<)9dw0T3T8>R96fQ4WYNU z7do8|UzS7o8ec~KTMm1BdqwQ-?h3I*B9T|DcBCJnbAM3X511e76{21nLeC%KGvlQc zOC}kjRt@5A15)qbAQSLmYimo-^kT929M!*!>K{@l6hizfGrXW@K2BqKSjqAb^vp+X zZS9lx_I7AA8c<&mn{}P4JMzW!REvVXzP?`D*474^F<7luL}#7sWqtyC%n^%4UE16Y}|{#74-tt`}!(QpW<;76oC zO(E&CBlgye6}t{g7Bxb~#|Vu)#m2@)A^*C%x*OEPK4O(-_JGX@>-+xx{vRC81I?tC zoqhajXlN)k7!22FuI|QSF%g~dXl-pxMsxgPb8~Z;{CdbP5QBcd|02__mU7$-Srt)q PvA_H`Dzc}sO8dV6V%wa- diff --git a/src/WIN/win.c b/src/WIN/win.c index 881abb563..984839073 100644 --- a/src/WIN/win.c +++ b/src/WIN/win.c @@ -28,6 +28,7 @@ #include "../ibm.h" #include "../cpu/cpu.h" #include "../mem.h" +#include "../network/network.h" #include "../rom.h" #include "../nvr.h" #include "../config.h" @@ -663,26 +664,20 @@ int fdd_type_to_icon(int type) case 0: return 512; case 1: - return 128; case 2: - return 130; case 3: - return 132; case 4: case 5: case 6: - return 134; + return 128; case 7: - return 144; case 8: - return 146; case 9: case 10: case 11: case 12: - return 150; case 13: - return 152; + return 144; } } @@ -894,6 +889,20 @@ void create_hd_tip(int part) wcscpy(sbTips[part], tempTip); } +void create_network_tip(int part) +{ + WCHAR tempTip[512]; + + _swprintf(tempTip, win_language_get_string_from_id(IDS_2069)); + + if (sbTips[part] != NULL) + { + free(sbTips[part]); + } + sbTips[part] = (WCHAR *) malloc((wcslen(tempTip) << 1) + 2); + wcscpy(sbTips[part], tempTip); +} + void update_tip(int meaning) { int i = 0; @@ -1022,9 +1031,28 @@ void destroy_tips(void) sbTips = NULL; } +int display_network_icon(void) +{ + if (network_card == 0) + { + return 0; + } + else + { + if (network_type == 0) + { + return 0; + } + else + { + return network_test(); + } + } +} + void update_status_bar_panes(HWND hwnds) { - int i, j, id; + int i, id; int edge = 0; int c_mfm = 0; @@ -1034,6 +1062,8 @@ void update_status_bar_panes(HWND hwnds) int c_ide_dma = 0; int c_scsi = 0; + int do_net = 0; + sb_ready = 0; c_mfm = count_hard_disks(HDD_BUS_MFM); @@ -1043,6 +1073,8 @@ void update_status_bar_panes(HWND hwnds) c_ide_dma = count_hard_disks(HDD_BUS_IDE_PIO_AND_DMA); c_scsi = count_hard_disks(HDD_BUS_SCSI); + do_net = display_network_icon(); + if (sb_parts > 0) { for (i = 0; i < sb_parts; i++) @@ -1136,6 +1168,10 @@ void update_status_bar_panes(HWND hwnds) { sb_parts++; } + if (do_net) + { + sb_parts++; + } sb_parts++; iStatusWidths = (int *) malloc(sb_parts * sizeof(int)); @@ -1239,6 +1275,13 @@ void update_status_bar_panes(HWND hwnds) sb_part_meanings[sb_parts] = SB_HDD | HDD_BUS_SCSI; sb_parts++; } + if (do_net) + { + edge += SB_ICON_WIDTH; + iStatusWidths[sb_parts] = edge; + sb_part_meanings[sb_parts] = SB_NETWORK; + sb_parts++; + } if (sb_parts) { iStatusWidths[sb_parts - 1] += (24 - SB_ICON_WIDTH); @@ -1277,19 +1320,7 @@ void update_status_bar_panes(HWND hwnds) { sb_icon_flags[i] = 256; } - if (cdrom_drives[id].bus_type == CDROM_BUS_SCSI) - { - j = 164; - } - else if (cdrom_drives[id].bus_type == CDROM_BUS_ATAPI_PIO_AND_DMA) - { - j = 162; - } - else - { - j = 160; - } - sb_part_icons[i] = j | sb_icon_flags[i]; + sb_part_icons[i] = 160 | sb_icon_flags[i]; sb_menu_handles[i] = create_popup_menu(i); create_cdrom_submenu(sb_menu_handles[i], sb_part_meanings[i] & 0xf); EnableMenuItem(sb_menu_handles[i], IDM_CDROM_RELOAD | (sb_part_meanings[i] & 0xf), MF_BYCOMMAND | MF_GRAYED); @@ -1308,9 +1339,14 @@ void update_status_bar_panes(HWND hwnds) break; case SB_HDD: /* Hard disk */ - sb_part_icons[i] = 192 + (((sb_part_meanings[i] & 0xf) - 1) << 1); + sb_part_icons[i] = 192; create_hd_tip(i); break; + case SB_NETWORK: + /* Hard disk */ + sb_part_icons[i] = 208; + create_network_tip(i); + break; case SB_TEXT: /* Status text */ SendMessage(hwnds, SB_SETTEXT, i | SBT_NOBORDERS, (LPARAM) L""); @@ -1340,22 +1376,17 @@ HWND EmulatorStatusBar(HWND hwndParent, int idStatus, HINSTANCE hinst) RECT rectDialog; int dw, dh; - for (i = 128; i < 136; i++) + for (i = 128; i < 130; i++) { hIcon[i] = LoadIconEx((PCTSTR) i); } - for (i = 144; i < 148; i++) + for (i = 144; i < 146; i++) { hIcon[i] = LoadIconEx((PCTSTR) i); } - for (i = 150; i < 154; i++) - { - hIcon[i] = LoadIconEx((PCTSTR) i); - } - - for (i = 160; i < 166; i++) + for (i = 160; i < 162; i++) { hIcon[i] = LoadIconEx((PCTSTR) i); } @@ -1365,27 +1396,27 @@ HWND EmulatorStatusBar(HWND hwndParent, int idStatus, HINSTANCE hinst) hIcon[i] = LoadIconEx((PCTSTR) i); } - for (i = 192; i < 204; i++) + for (i = 192; i < 194; i++) { hIcon[i] = LoadIconEx((PCTSTR) i); } - for (i = 384; i < 392; i++) + for (i = 208; i < 210; i++) { hIcon[i] = LoadIconEx((PCTSTR) i); } - for (i = 400; i < 404; i++) + for (i = 384; i < 386; i++) { hIcon[i] = LoadIconEx((PCTSTR) i); } - for (i = 406; i < 410; i++) + for (i = 400; i < 402; i++) { hIcon[i] = LoadIconEx((PCTSTR) i); } - for (i = 416; i < 422; i++) + for (i = 416; i < 418; i++) { hIcon[i] = LoadIconEx((PCTSTR) i); } @@ -1533,6 +1564,8 @@ int WINAPI WinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPSTR lpsz init_cdrom_host_drives(); + network_init(); + hwndStatus = EmulatorStatusBar(hwnd, IDC_STATUS, hThisInstance); OriginalStatusBarProcedure = GetWindowLongPtr(hwndStatus, GWLP_WNDPROC); diff --git a/src/WIN/win_settings.c b/src/WIN/win_settings.c index 9c27da4ea..fc95fc854 100644 --- a/src/WIN/win_settings.c +++ b/src/WIN/win_settings.c @@ -3483,14 +3483,6 @@ static BOOL win_settings_cdrom_drives_image_list_init(HWND hwndList) ImageList_AddIcon(hSmall, hiconItem); DestroyIcon(hiconItem); - hiconItem = LoadIcon(hinstance, (LPCWSTR) 162); - ImageList_AddIcon(hSmall, hiconItem); - DestroyIcon(hiconItem); - - hiconItem = LoadIcon(hinstance, (LPCWSTR) 164); - ImageList_AddIcon(hSmall, hiconItem); - DestroyIcon(hiconItem); - ListView_SetImageList(hwndList, hSmall, LVSIL_SMALL); return TRUE; @@ -3578,12 +3570,12 @@ static BOOL win_settings_cdrom_drives_recalc_list(HWND hwndList) case CDROM_BUS_ATAPI_PIO_AND_DMA: wsprintf(szText, win_language_get_string_from_id(fsid), temp_cdrom_drives[i].ide_channel >> 1, temp_cdrom_drives[i].ide_channel & 1); lvI.pszText = szText; - lvI.iImage = 2; + lvI.iImage = 1; break; case CDROM_BUS_SCSI: wsprintf(szText, win_language_get_string_from_id(fsid), temp_cdrom_drives[i].scsi_device_id, temp_cdrom_drives[i].scsi_device_lun); lvI.pszText = szText; - lvI.iImage = 3; + lvI.iImage = 1; break; } @@ -3774,12 +3766,12 @@ static void win_settings_cdrom_drives_update_item(HWND hwndList, int i) case CDROM_BUS_ATAPI_PIO_AND_DMA: wsprintf(szText, win_language_get_string_from_id(fsid), temp_cdrom_drives[i].ide_channel >> 1, temp_cdrom_drives[i].ide_channel & 1); lvI.pszText = szText; - lvI.iImage = 2; + lvI.iImage = 1; break; case CDROM_BUS_SCSI: wsprintf(szText, win_language_get_string_from_id(fsid), temp_cdrom_drives[i].scsi_device_id, temp_cdrom_drives[i].scsi_device_lun); lvI.pszText = szText; - lvI.iImage = 3; + lvI.iImage = 1; break; } diff --git a/src/ibm.h b/src/ibm.h index 61b662ebc..af30ad43e 100644 --- a/src/ibm.h +++ b/src/ibm.h @@ -809,6 +809,7 @@ extern void status_settext(char *str); #define SB_CDROM 0x10 #define SB_RDISK 0x20 #define SB_HDD 0x40 -#define SB_TEXT 0x50 +#define SB_NETWORK 0x50 +#define SB_TEXT 0x60 #define UNUSED(x) (void)x diff --git a/src/pc.c b/src/pc.c index 0df42a936..2695067ab 100644 --- a/src/pc.c +++ b/src/pc.c @@ -364,7 +364,6 @@ void initmodules(void) int i; /* Initialize modules. */ - network_init(); mouse_init(); #ifdef WALTJE serial_init();