diff --git a/src/WIN/86Box.rc b/src/WIN/86Box.rc index b8761032d..37c1a69e8 100644 --- a/src/WIN/86Box.rc +++ b/src/WIN/86Box.rc @@ -66,7 +66,7 @@ BEGIN MENUITEM "&2x", IDM_VID_SCALE_4X END MENUITEM SEPARATOR - MENUITEM "&Fullscreen\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Fullscreen\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN POPUP "Fullscreen &stretch mode" BEGIN MENUITEM "&Full screen stretch", IDM_VID_FS_FULL @@ -83,9 +83,11 @@ BEGIN END MENUITEM "S&tatus", IDM_STATUS #ifdef ENABLE_LOG_TOGGLES -#if defined ENABLE_BUSLOGIC_LOG || defined ENABLE_CDROM_LOG || defined ENABLE_D86F_LOG || defined ENABLE_FDC_LOG || defined ENABLE_IDE_LOG || defined ENABLE_NE2000_LOG +# if defined(ENABLE_BUSLOGIC_LOG) || defined(ENABLE_CDROM_LOG) || \ + defined(ENABLE_D86F_LOG) || defined(ENABLE_FDC_LOG) || \ + defined(ENABLE_IDE_LOG) || defined(ENABLE_NE2000_LOG) MENUITEM SEPARATOR -#endif +# endif #ifdef ENABLE_BUSLOGIC_LOG MENUITEM "Enable BusLogic logs\tCtrl+F4", IDM_LOG_BUSLOGIC #endif @@ -450,81 +452,81 @@ END // remains consistent on all systems. #ifdef RELEASE_BUILD /* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC_256x256.png */ -100 ICON DISCARDABLE "ICONS/86Box-RB.ico" +100 ICON DISCARDABLE "WIN/ICONS/86Box-RB.ico" #else /* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC2_256x256.png */ -100 ICON DISCARDABLE "ICONS/86Box.ico" +100 ICON DISCARDABLE "WIN/ICONS/86Box.ico" #endif -128 ICON DISCARDABLE "ICONS/floppy_525_1dd.ico" -129 ICON DISCARDABLE "ICONS/floppy_525_1dd_active.ico" -130 ICON DISCARDABLE "ICONS/floppy_525_2dd.ico" -131 ICON DISCARDABLE "ICONS/floppy_525_2dd_active.ico" -132 ICON DISCARDABLE "ICONS/floppy_525_2qd.ico" -133 ICON DISCARDABLE "ICONS/floppy_525_2qd_active.ico" -134 ICON DISCARDABLE "ICONS/floppy_525_2hd.ico" -135 ICON DISCARDABLE "ICONS/floppy_525_2hd_active.ico" -144 ICON DISCARDABLE "ICONS/floppy_35_1dd.ico" -145 ICON DISCARDABLE "ICONS/floppy_35_1dd_active.ico" -146 ICON DISCARDABLE "ICONS/floppy_35_2dd.ico" -147 ICON DISCARDABLE "ICONS/floppy_35_2dd_active.ico" -150 ICON DISCARDABLE "ICONS/floppy_35_2hd.ico" -151 ICON DISCARDABLE "ICONS/floppy_35_2hd_active.ico" -152 ICON DISCARDABLE "ICONS/floppy_35_2ed.ico" -153 ICON DISCARDABLE "ICONS/floppy_35_2ed_active.ico" -160 ICON DISCARDABLE "ICONS/cdrom_atapi.ico" -161 ICON DISCARDABLE "ICONS/cdrom_atapi_active.ico" -162 ICON DISCARDABLE "ICONS/cdrom_atapi_dma.ico" -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_xtide.ico" -195 ICON DISCARDABLE "ICONS/hard_disk_xtide_active.ico" -196 ICON DISCARDABLE "ICONS/hard_disk_rll.ico" -197 ICON DISCARDABLE "ICONS/hard_disk_rll_active.ico" -198 ICON DISCARDABLE "ICONS/hard_disk.ico" -199 ICON DISCARDABLE "ICONS/hard_disk_active.ico" -200 ICON DISCARDABLE "ICONS/hard_disk_ide.ico" -201 ICON DISCARDABLE "ICONS/hard_disk_ide_active.ico" -202 ICON DISCARDABLE "ICONS/hard_disk_scsi.ico" -203 ICON DISCARDABLE "ICONS/hard_disk_scsi_active.ico" -256 ICON DISCARDABLE "ICONS/machine.ico" -257 ICON DISCARDABLE "ICONS/video.ico" -258 ICON DISCARDABLE "ICONS/input_devices.ico" -259 ICON DISCARDABLE "ICONS/sound.ico" -260 ICON DISCARDABLE "ICONS/network.ico" -261 ICON DISCARDABLE "ICONS/other_peripherals.ico" -262 ICON DISCARDABLE "ICONS/hard_disk.ico" -263 ICON DISCARDABLE "ICONS/removable_devices.ico" -384 ICON DISCARDABLE "ICONS/floppy_525_1dd_empty.ico" -385 ICON DISCARDABLE "ICONS/floppy_525_1dd_empty_active.ico" -386 ICON DISCARDABLE "ICONS/floppy_525_2dd_empty.ico" -387 ICON DISCARDABLE "ICONS/floppy_525_2dd_empty_active.ico" -388 ICON DISCARDABLE "ICONS/floppy_525_2qd_empty.ico" -389 ICON DISCARDABLE "ICONS/floppy_525_2qd_empty_active.ico" -390 ICON DISCARDABLE "ICONS/floppy_525_2hd_empty.ico" -391 ICON DISCARDABLE "ICONS/floppy_525_2hd_empty_active.ico" -400 ICON DISCARDABLE "ICONS/floppy_35_1dd_empty.ico" -401 ICON DISCARDABLE "ICONS/floppy_35_1dd_empty_active.ico" -402 ICON DISCARDABLE "ICONS/floppy_35_2dd_empty.ico" -403 ICON DISCARDABLE "ICONS/floppy_35_2dd_empty_active.ico" -406 ICON DISCARDABLE "ICONS/floppy_35_2hd_empty.ico" -407 ICON DISCARDABLE "ICONS/floppy_35_2hd_empty_active.ico" -408 ICON DISCARDABLE "ICONS/floppy_35_2ed_empty.ico" -409 ICON DISCARDABLE "ICONS/floppy_35_2ed_empty_active.ico" -416 ICON DISCARDABLE "ICONS/cdrom_atapi_empty.ico" -417 ICON DISCARDABLE "ICONS/cdrom_atapi_empty_active.ico" -418 ICON DISCARDABLE "ICONS/cdrom_atapi_dma_empty.ico" -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" +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" +256 ICON DISCARDABLE "WIN/ICONS/machine.ico" +257 ICON DISCARDABLE "WIN/ICONS/video.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" +512 ICON DISCARDABLE "WIN/ICONS/floppy_disabled.ico" +514 ICON DISCARDABLE "WIN/ICONS/cdrom_disabled.ico" #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -647,205 +649,206 @@ END STRINGTABLE DISCARDABLE BEGIN - 2048 "86Box" - IDS_STRING2049 "86Box Error" - IDS_STRING2050 "86Box Fatal Error" - IDS_STRING2051 "This will reset 86Box.\nAre you sure you want to save the settings?" - IDS_STRING2052 "DirectDraw Screenshot Error" - IDS_STRING2053 "Invalid number of sectors (valid values are between 1 and 63)" - IDS_STRING2054 "Invalid number of heads (valid values are between 1 and 16)" - IDS_STRING2055 "Invalid number of cylinders (valid values are between 1 and 266305)" - IDS_STRING2056 "Please enter a valid file name" - IDS_STRING2057 "Unable to open the file for write" - IDS_STRING2058 "Attempting to create a HDI image larger than 4 GB" - IDS_STRING2059 "Remember to partition and format the new drive" - IDS_STRING2060 "Unable to open the file for read" - IDS_STRING2061 "HDI or HDX image with a sector size that is not 512 are not supported" - IDS_STRING2062 "86Box was unable to find any ROMs.\nAt least one ROM set is required to use 86Box." - IDS_STRING2063 "Configured ROM set not available.\nDefaulting to an available ROM set." + 2048 "86Box" + IDS_2049 "86Box Error" + IDS_2050 "86Box Fatal Error" + IDS_2051 "This will reset 86Box.\nAre you sure you want to save the settings?" + IDS_2052 "DirectDraw Screenshot Error" + IDS_2053 "Invalid number of sectors (valid values are between 1 and 63)" + IDS_2054 "Invalid number of heads (valid values are between 1 and 16)" + IDS_2055 "Invalid number of cylinders (valid values are between 1 and 266305)" + IDS_2056 "Please enter a valid file name" + IDS_2057 "Unable to open the file for write" + IDS_2058 "Attempting to create a HDI image larger than 4 GB" + IDS_2059 "Remember to partition and format the new drive" + IDS_2060 "Unable to open the file for read" + IDS_2061 "HDI or HDX image with a sector size that is not 512 are not supported" + IDS_2062 "86Box was unable to find any ROMs.\nAt least one ROM set is required to use 86Box." + IDS_2063 "Configured ROM set not available.\nDefaulting to an available ROM set." END STRINGTABLE DISCARDABLE BEGIN - IDS_STRING2064 "Configured video BIOS not available.\nDefaulting to an available video BIOS." - IDS_STRING2065 "Machine" - IDS_STRING2066 "Video" - IDS_STRING2067 "Input devices" - IDS_STRING2068 "Sound" - IDS_STRING2069 "Network" - IDS_STRING2070 "Other peripherals" - IDS_STRING2071 "Hard disks" - IDS_STRING2072 "Removable devices" - IDS_STRING2073 "%i"" floppy drive: %s" - IDS_STRING2074 "Disabled CD-ROM drive" - IDS_STRING2075 "%s CD-ROM drive: %s" - IDS_STRING2076 "Host CD/DVD Drive (%c:)" - IDS_STRING2077 "Click to capture mouse" - IDS_STRING2078 "Press F12-F8 to release mouse" - IDS_STRING2079 "Press F12-F8 or middle button to release mouse" + IDS_2064 "Configured video BIOS not available.\nDefaulting to an available video BIOS." + IDS_2065 "Machine" + IDS_2066 "Video" + IDS_2067 "Input devices" + IDS_2068 "Sound" + IDS_2069 "Network" + IDS_2070 "Other peripherals" + IDS_2071 "Hard disks" + IDS_2072 "Removable devices" + IDS_2073 "%i"" floppy drive: %s" + IDS_2074 "Disabled CD-ROM drive" + IDS_2075 "%s CD-ROM drive: %s" + IDS_2076 "Host CD/DVD Drive (%c:)" + IDS_2077 "Click to capture mouse" + IDS_2078 "Press F12-F8 to release mouse" + IDS_2079 "Press F12-F8 or middle button to release mouse" END STRINGTABLE DISCARDABLE BEGIN - 2080 "Drive" - 2081 "Location" - 2082 "Bus" - 2083 "File" - 2084 "C" - 2085 "H" - 2086 "S" - 2087 "MB" - 2088 "%i" - 2089 "Enabled" - 2090 "Mute" - 2091 "Type" - 2092 "Bus" - 2093 "DMA" - 2094 "KB" - 2095 "MFM, RLL, or ESDI CD-ROM drives never existed" + IDS_2080 "Drive" + IDS_2081 "Location" + IDS_2082 "Bus" + IDS_2083 "File" + IDS_2084 "C" + IDS_2085 "H" + IDS_2086 "S" + IDS_2087 "MB" + IDS_2088 "%i" + IDS_2089 "Enabled" + IDS_2090 "Mute" + IDS_2091 "Type" + IDS_2092 "Bus" + IDS_2093 "DMA" + IDS_2094 "KB" + IDS_2095 "MFM, RLL, or ESDI CD-ROM drives never existed" END STRINGTABLE DISCARDABLE BEGIN - 2096 "Slave" - 2097 "SCSI (ID %s, LUN %s)" - 2098 "Adapter Type" - 2099 "Base Address" - 2100 "IRQ" - 2101 "8-bit DMA" - 2102 "16-bit DMA" - 2103 "BIOS" - 2104 "Network Type" - 2105 "Surround Module" - 2106 "MPU-401 Base Address" - 2107 "No PCap devices found" - 2108 "On-board RAM" - 2109 "Memory Size" - 2110 "Display Type" - 2111 "RGB" + IDS_2096 "Slave" + IDS_2097 "SCSI (ID %s, LUN %s)" + IDS_2098 "Adapter Type" + IDS_2099 "Base Address" + IDS_2100 "IRQ" + IDS_2101 "8-bit DMA" + IDS_2102 "16-bit DMA" + IDS_2103 "BIOS" + IDS_2104 "Network Type" + IDS_2105 "Surround Module" + IDS_2106 "MPU-401 Base Address" + IDS_2107 "No PCap devices found" + IDS_2108 "On-board RAM" + IDS_2109 "Memory Size" + IDS_2110 "Display Type" + IDS_2111 "RGB" END STRINGTABLE DISCARDABLE BEGIN - 2112 "Composite" - 2113 "Composite Type" - 2114 "Old" - 2115 "New" - 2116 "RGB Type" - 2117 "Color" - 2118 "Monochrome (Green)" - 2119 "Monochrome (Amber)" - 2120 "Monochrome (Gray)" - 2121 "Color (no brown)" - 2122 "Monochrome (Default)" - 2123 "Snow Emulation" - 2124 "Bilinear Filtering" - 2125 "Dithering" - 2126 "Framebuffer Memory Size" - 2127 "Texture Memory Size" + IDS_2112 "Composite" + IDS_2113 "Composite Type" + IDS_2114 "Old" + IDS_2115 "New" + IDS_2116 "RGB Type" + IDS_2117 "Color" + IDS_2118 "Monochrome (Green)" + IDS_2119 "Monochrome (Amber)" + IDS_2120 "Monochrome (Gray)" + IDS_2121 "Color (no brown)" + IDS_2122 "Monochrome (Default)" + IDS_2123 "Snow Emulation" + IDS_2124 "Bilinear Filtering" + IDS_2125 "Dithering" + IDS_2126 "Framebuffer Memory Size" + IDS_2127 "Texture Memory Size" END STRINGTABLE DISCARDABLE BEGIN - 2128 "Screen Filter" - 2129 "Render Threads" - 2130 "Recompiler" - 2131 "System Default" - 2132 "%i Wait state(s)" - 2133 "8-bit" - 2134 "Slow 16-bit" - 2135 "Fast 16-bit" - 2136 "Slow VLB/PCI" - 2137 "Mid VLB/PCI" - 2138 "Fast VLB/PCI" - 2139 "Microsoft 2-button mouse (serial)" - 2140 "Mouse Systems mouse (serial)" - 2141 "2-button mouse (PS/2)" - 2142 "Microsoft Intellimouse (PS/2)" - 2143 "Bus mouse" + IDS_2128 "Screen Filter" + IDS_2129 "Render Threads" + IDS_2130 "Recompiler" + IDS_2131 "System Default" + IDS_2132 "%i Wait state(s)" + IDS_2133 "8-bit" + IDS_2134 "Slow 16-bit" + IDS_2135 "Fast 16-bit" + IDS_2136 "Slow VLB/PCI" + IDS_2137 "Mid VLB/PCI" + IDS_2138 "Fast VLB/PCI" + IDS_2139 "Microsoft 2-button mouse (serial)" + IDS_2140 "Mouse Systems mouse (serial)" + IDS_2141 "2-button mouse (PS/2)" + IDS_2142 "Microsoft Intellimouse (PS/2)" + IDS_2143 "Bus mouse" END STRINGTABLE DISCARDABLE BEGIN - 2144 "Standard 2-button joystick(s)" - 2145 "Standard 4-button joystick" - 2146 "Standard 6-button joystick" - 2147 "Standard 8-button joystick" - 2148 "CH Flightstick Pro" - 2149 "Microsoft SideWinder Pad" - 2150 "Thrustmaster Flight Control System" - 2151 "Disabled" - 2152 "None" - 2153 "AT Fixed Disk Adapter" - 2154 "Internal IDE" - 2155 "IRQ %i" - 2156 "MFM (%01i:%01i)" - 2157 "IDE (PIO+DMA) (%01i:%01i)" - 2158 "SCSI (%02i:%02i)" - 2159 "Invalid number of cylinders (valid values are between 1 and 1023)" - 2160 "%" PRIu64 - 2161 "Genius Bus mouse" - 2162 "Amstrad mouse" - 2163 "Attempting to create a spuriously large hard disk image" - 2164 "Invalid number of sectors (valid values are between 1 and 99)" - 2165 "MFM" - 2166 "XT IDE" - 2167 "RLL" - 2168 "IDE (PIO-only)" - 2169 "%01i:%01i" - 2170 "Custom..." - 2171 "%" PRIu64 " MB (CHS: %" PRIu64 ", %" PRIu64 ", %" PRIu64 ")" - 2172 "Hard disk images (*.HDI;*.HDX;*.IMA;*.IMG)\0*.HDI;*.HDX;*.IMA;*.IMG\0All files (*.*)\0*.*\0" - 2173 "All floppy images (*.0??;*.12;*.144;*.360;*.720;*.86F;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMD;*.IMG;*.TD0;*.VFD;*.XDF)\0*.0??;*.12;*.144;*.360;*.720;*.86F;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMD;*.IMG;*.TD0;*.VFD;*.XDF\0Advanced sector-based images (*.IMD;*.TD0)\0*.IMD;*.TD0\0Basic sector-based images (*.0??;*.12;*.144;*.360;*.720;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMG;*.VFD;*.XDF)\0*.0??;*.12;*.144;*.360;*.720;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMG;*.VFD;*.XDF\0Flux images (*.FDI)\0*.FDI\0Surface-based images (*.86F)\0*.86F\0All files (*.*)\0*.*\0" - 2174 "Configuration files (*.CFG)\0*.CFG\0All files (*.*)\0*.*\0" - 2175 "CD-ROM image (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0" - 2176 "Use CTRL + ALT + PAGE DOWN to return to windowed mode" - 2177 "Olivetti M24 mouse" - 2178 "This image exists and will be overwritten.\nAre you sure you want to use it?" - 2179 "Floppy %i (%s): %ws" - 2180 "CD-ROM %i: %ws" - 2181 "MFM hard disk" - 2182 "IDE hard disk (PIO-only)" - 2183 "IDE hard disk (PIO and DMA)" - 2184 "SCSI hard disk" - 2185 "(empty)" - 2186 "(host drive %c:)" - 2187 "Custom (large)..." - 2188 "Type" - 2189 "ATAPI (PIO-only)" - 2190 "ATAPI (PIO and DMA)" - 2191 "ATAPI (PIO-only) (%01i:%01i)" - 2192 "ATAPI (PIO and DMA) (%01i:%01i)" - 2193 "Use CTRL + ALT + PAGE DOWN to return to windowed mode" - 2194 "Unable to create bitmap file: %s" - 2195 "IDE (PIO-only) (%01i:%01i)" - 2196 "Add New Hard Disk" - 2197 "Add Existing Hard Disk" - 2198 "SCSI removable disk %i: %s" - 2199 "USB is not yet supported" - 2200 "Invalid PCap device" - 2201 "&Notify disk change" - 2202 "SCSI (removable)" - 2203 "SCSI (removable) (%02i:%02i)" - 2204 "Pcap Library Not Available" - 2205 "RLL (%01i:%01i)" - 2206 "XT IDE (%01i:%01i)" - 2207 "RLL hard disk" - 2208 "XT IDE hard disk" - 2209 "IDE (PIO and DMA)" - 2210 "SCSI" - 2211 "&New image..." - 2212 "Existing image..." - 2213 "Existing image (&Write-protected)..." - 2214 "E&ject" - 2215 "&Mute" - 2216 "E&mpty" - 2217 "&Reload previous image" - 2218 "&Image..." - 2219 "PCap failed to set up because it may not be initialized" - 2220 "Image (&Write-protected)..." - 2221 "English (United States)" + IDS_2144 "Standard 2-button joystick(s)" + IDS_2145 "Standard 4-button joystick" + IDS_2146 "Standard 6-button joystick" + IDS_2147 "Standard 8-button joystick" + IDS_2148 "CH Flightstick Pro" + IDS_2149 "Microsoft SideWinder Pad" + IDS_2150 "Thrustmaster Flight Control System" + IDS_2151 "Disabled" + IDS_2152 "None" + IDS_2153 "AT Fixed Disk Adapter" + IDS_2154 "Internal IDE" + IDS_2155 "IRQ %i" + IDS_2156 "MFM (%01i:%01i)" + IDS_2157 "IDE (PIO+DMA) (%01i:%01i)" + IDS_2158 "SCSI (%02i:%02i)" + IDS_2159 "Invalid number of cylinders (valid values are between 1 and 1023)" + IDS_2160 "%" PRIu64 + IDS_2161 "Genius Bus mouse" + IDS_2162 "Amstrad mouse" + IDS_2163 "Attempting to create a spuriously large hard disk image" + IDS_2164 "Invalid number of sectors (valid values are between 1 and 99)" + IDS_2165 "MFM" + IDS_2166 "XT IDE" + IDS_2167 "RLL" + IDS_2168 "IDE (PIO-only)" + IDS_2169 "%01i:%01i" + IDS_2170 "Custom..." + IDS_2171 "%" PRIu64 " MB (CHS: %" PRIu64 ", %" PRIu64 ", %" PRIu64 ")" + IDS_2172 "Hard disk images (*.HDI;*.HDX;*.IMA;*.IMG)\0*.HDI;*.HDX;*.IMA;*.IMG\0All files (*.*)\0*.*\0" + IDS_2173"All floppy images (*.0??;*.12;*.144;*.360;*.720;*.86F;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMD;*.IMG;*.TD0;*.VFD;*.XDF)\0*.0??;*.12;*.144;*.360;*.720;*.86F;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMD;*.IMG;*.TD0;*.VFD;*.XDF\0Advanced sector-based images (*.IMD;*.TD0)\0*.IMD;*.TD0\0Basic sector-based images (*.0??;*.12;*.144;*.360;*.720;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMG;*.VFD;*.XDF)\0*.0??;*.12;*.144;*.360;*.720;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMG;*.VFD;*.XDF\0Flux images (*.FDI)\0*.FDI\0Surface-based images (*.86F)\0*.86F\0All files (*.*)\0*.*\0" + IDS_2174 "Configuration files (*.CFG)\0*.CFG\0All files (*.*)\0*.*\0" + IDS_2175 "CD-ROM image (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0" + IDS_2176 "Use CTRL + ALT + PAGE DOWN to return to windowed mode" + IDS_2177 "Olivetti M24 mouse" + IDS_2178 "This image exists and will be overwritten.\nAre you sure you want to use it?" + IDS_2179 "Floppy %i (%s): %ws" + IDS_2180 "CD-ROM %i: %ws" + IDS_2181 "MFM hard disk" + IDS_2182 "IDE hard disk (PIO-only)" + IDS_2183 "IDE hard disk (PIO and DMA)" + IDS_2184 "SCSI hard disk" + IDS_2185 "(empty)" + IDS_2186 "(host drive %c:)" + IDS_2187 "Custom (large)..." + IDS_2188 "Type" + IDS_2189 "ATAPI (PIO-only)" + IDS_2190 "ATAPI (PIO and DMA)" + IDS_2191 "ATAPI (PIO-only) (%01i:%01i)" + IDS_2192 "ATAPI (PIO and DMA) (%01i:%01i)" + IDS_2193 "Use CTRL + ALT + PAGE DOWN to return to windowed mode" + IDS_2194 "Unable to create bitmap file: %s" + IDS_2195 "IDE (PIO-only) (%01i:%01i)" + IDS_2196 "Add New Hard Disk" + IDS_2197 "Add Existing Hard Disk" + IDS_2198 "SCSI removable disk %i: %s" + IDS_2199 "USB is not yet supported" + IDS_2200 "Invalid PCap device" + IDS_2201 "&Notify disk change" + IDS_2202 "SCSI (removable)" + IDS_2203 "SCSI (removable) (%02i:%02i)" + IDS_2204 "Pcap Library Not Available" + IDS_2205 "RLL (%01i:%01i)" + IDS_2206 "XT IDE (%01i:%01i)" + IDS_2207 "RLL hard disk" + IDS_2208 "XT IDE hard disk" + IDS_2209 "IDE (PIO and DMA)" + IDS_2210 "SCSI" + IDS_2211 "&New image..." + IDS_2212 "Existing image..." + IDS_2213 "Existing image (&Write-protected)..." + IDS_2214 "E&ject" + IDS_2215 "&Mute" + IDS_2216 "E&mpty" + IDS_2217 "&Reload previous image" + IDS_2218 "&Image..." + IDS_2219 "PCap failed to set up because it may not be initialized" + IDS_2220 "Image (&Write-protected)..." + IDS_2221 "English (United States)" END +#define IDS_LANG_ENUS IDS_2221 #ifndef _MAC @@ -855,8 +858,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,20,0,0 - PRODUCTVERSION 1,20,0,0 + FILEVERSION 2,0,0,0 + PRODUCTVERSION 2,0,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -874,14 +877,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "IRC #SoftHistory\0" VALUE "FileDescription", "86Box - an emulator for X86-based systems\0" - VALUE "FileVersion", "1.20\0" - VALUE "InternalName", "pc_new\0" + VALUE "FileVersion", "2.00\0" + VALUE "InternalName", "86Box\0" VALUE "LegalCopyright", "Copyright © SoftHistory, Sarah Walker, 2007-2017, Released under the GNU GPL v2\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "86Box.exe\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "86Box Emulator\0" - VALUE "ProductVersion", "1.20\0" + VALUE "ProductVersion", "2.00\0" VALUE "SpecialBuild", "\0" END END diff --git a/src/ICONS/86Box-RB.ico b/src/WIN/ICONS/86Box-RB.ico similarity index 100% rename from src/ICONS/86Box-RB.ico rename to src/WIN/ICONS/86Box-RB.ico diff --git a/src/ICONS/86Box.ico b/src/WIN/ICONS/86Box.ico similarity index 100% rename from src/ICONS/86Box.ico rename to src/WIN/ICONS/86Box.ico diff --git a/src/ICONS/cdrom_atapi.ico b/src/WIN/ICONS/cdrom_atapi.ico similarity index 100% rename from src/ICONS/cdrom_atapi.ico rename to src/WIN/ICONS/cdrom_atapi.ico diff --git a/src/ICONS/cdrom_atapi_active.ico b/src/WIN/ICONS/cdrom_atapi_active.ico similarity index 100% rename from src/ICONS/cdrom_atapi_active.ico rename to src/WIN/ICONS/cdrom_atapi_active.ico diff --git a/src/ICONS/cdrom_atapi_dma.ico b/src/WIN/ICONS/cdrom_atapi_dma.ico similarity index 100% rename from src/ICONS/cdrom_atapi_dma.ico rename to src/WIN/ICONS/cdrom_atapi_dma.ico diff --git a/src/ICONS/cdrom_atapi_dma_active.ico b/src/WIN/ICONS/cdrom_atapi_dma_active.ico similarity index 100% rename from src/ICONS/cdrom_atapi_dma_active.ico rename to src/WIN/ICONS/cdrom_atapi_dma_active.ico diff --git a/src/ICONS/cdrom_atapi_dma_empty.ico b/src/WIN/ICONS/cdrom_atapi_dma_empty.ico similarity index 100% rename from src/ICONS/cdrom_atapi_dma_empty.ico rename to src/WIN/ICONS/cdrom_atapi_dma_empty.ico diff --git a/src/ICONS/cdrom_atapi_dma_empty_active.ico b/src/WIN/ICONS/cdrom_atapi_dma_empty_active.ico similarity index 100% rename from src/ICONS/cdrom_atapi_dma_empty_active.ico rename to src/WIN/ICONS/cdrom_atapi_dma_empty_active.ico diff --git a/src/ICONS/cdrom_atapi_empty.ico b/src/WIN/ICONS/cdrom_atapi_empty.ico similarity index 100% rename from src/ICONS/cdrom_atapi_empty.ico rename to src/WIN/ICONS/cdrom_atapi_empty.ico diff --git a/src/ICONS/cdrom_atapi_empty_active.ico b/src/WIN/ICONS/cdrom_atapi_empty_active.ico similarity index 100% rename from src/ICONS/cdrom_atapi_empty_active.ico rename to src/WIN/ICONS/cdrom_atapi_empty_active.ico diff --git a/src/ICONS/cdrom_disabled.ico b/src/WIN/ICONS/cdrom_disabled.ico similarity index 100% rename from src/ICONS/cdrom_disabled.ico rename to src/WIN/ICONS/cdrom_disabled.ico diff --git a/src/ICONS/cdrom_scsi.ico b/src/WIN/ICONS/cdrom_scsi.ico similarity index 100% rename from src/ICONS/cdrom_scsi.ico rename to src/WIN/ICONS/cdrom_scsi.ico diff --git a/src/ICONS/cdrom_scsi_active.ico b/src/WIN/ICONS/cdrom_scsi_active.ico similarity index 100% rename from src/ICONS/cdrom_scsi_active.ico rename to src/WIN/ICONS/cdrom_scsi_active.ico diff --git a/src/ICONS/cdrom_scsi_empty.ico b/src/WIN/ICONS/cdrom_scsi_empty.ico similarity index 100% rename from src/ICONS/cdrom_scsi_empty.ico rename to src/WIN/ICONS/cdrom_scsi_empty.ico diff --git a/src/ICONS/cdrom_scsi_empty_active.ico b/src/WIN/ICONS/cdrom_scsi_empty_active.ico similarity index 100% rename from src/ICONS/cdrom_scsi_empty_active.ico rename to src/WIN/ICONS/cdrom_scsi_empty_active.ico diff --git a/src/ICONS/floppy_35_1dd.ico b/src/WIN/ICONS/floppy_35_1dd.ico similarity index 100% rename from src/ICONS/floppy_35_1dd.ico rename to src/WIN/ICONS/floppy_35_1dd.ico diff --git a/src/ICONS/floppy_35_1dd_active.ico b/src/WIN/ICONS/floppy_35_1dd_active.ico similarity index 100% rename from src/ICONS/floppy_35_1dd_active.ico rename to src/WIN/ICONS/floppy_35_1dd_active.ico diff --git a/src/ICONS/floppy_35_1dd_empty.ico b/src/WIN/ICONS/floppy_35_1dd_empty.ico similarity index 100% rename from src/ICONS/floppy_35_1dd_empty.ico rename to src/WIN/ICONS/floppy_35_1dd_empty.ico diff --git a/src/ICONS/floppy_35_1dd_empty_active.ico b/src/WIN/ICONS/floppy_35_1dd_empty_active.ico similarity index 100% rename from src/ICONS/floppy_35_1dd_empty_active.ico rename to src/WIN/ICONS/floppy_35_1dd_empty_active.ico diff --git a/src/ICONS/floppy_35_2dd.ico b/src/WIN/ICONS/floppy_35_2dd.ico similarity index 100% rename from src/ICONS/floppy_35_2dd.ico rename to src/WIN/ICONS/floppy_35_2dd.ico diff --git a/src/ICONS/floppy_35_2dd_active.ico b/src/WIN/ICONS/floppy_35_2dd_active.ico similarity index 100% rename from src/ICONS/floppy_35_2dd_active.ico rename to src/WIN/ICONS/floppy_35_2dd_active.ico diff --git a/src/ICONS/floppy_35_2dd_empty.ico b/src/WIN/ICONS/floppy_35_2dd_empty.ico similarity index 100% rename from src/ICONS/floppy_35_2dd_empty.ico rename to src/WIN/ICONS/floppy_35_2dd_empty.ico diff --git a/src/ICONS/floppy_35_2dd_empty_active.ico b/src/WIN/ICONS/floppy_35_2dd_empty_active.ico similarity index 100% rename from src/ICONS/floppy_35_2dd_empty_active.ico rename to src/WIN/ICONS/floppy_35_2dd_empty_active.ico diff --git a/src/ICONS/floppy_35_2ed.ico b/src/WIN/ICONS/floppy_35_2ed.ico similarity index 100% rename from src/ICONS/floppy_35_2ed.ico rename to src/WIN/ICONS/floppy_35_2ed.ico diff --git a/src/ICONS/floppy_35_2ed_active.ico b/src/WIN/ICONS/floppy_35_2ed_active.ico similarity index 100% rename from src/ICONS/floppy_35_2ed_active.ico rename to src/WIN/ICONS/floppy_35_2ed_active.ico diff --git a/src/ICONS/floppy_35_2ed_empty.ico b/src/WIN/ICONS/floppy_35_2ed_empty.ico similarity index 100% rename from src/ICONS/floppy_35_2ed_empty.ico rename to src/WIN/ICONS/floppy_35_2ed_empty.ico diff --git a/src/ICONS/floppy_35_2ed_empty_active.ico b/src/WIN/ICONS/floppy_35_2ed_empty_active.ico similarity index 100% rename from src/ICONS/floppy_35_2ed_empty_active.ico rename to src/WIN/ICONS/floppy_35_2ed_empty_active.ico diff --git a/src/ICONS/floppy_35_2hd.ico b/src/WIN/ICONS/floppy_35_2hd.ico similarity index 100% rename from src/ICONS/floppy_35_2hd.ico rename to src/WIN/ICONS/floppy_35_2hd.ico diff --git a/src/ICONS/floppy_35_2hd_active.ico b/src/WIN/ICONS/floppy_35_2hd_active.ico similarity index 100% rename from src/ICONS/floppy_35_2hd_active.ico rename to src/WIN/ICONS/floppy_35_2hd_active.ico diff --git a/src/ICONS/floppy_35_2hd_empty.ico b/src/WIN/ICONS/floppy_35_2hd_empty.ico similarity index 100% rename from src/ICONS/floppy_35_2hd_empty.ico rename to src/WIN/ICONS/floppy_35_2hd_empty.ico diff --git a/src/ICONS/floppy_35_2hd_empty_active.ico b/src/WIN/ICONS/floppy_35_2hd_empty_active.ico similarity index 100% rename from src/ICONS/floppy_35_2hd_empty_active.ico rename to src/WIN/ICONS/floppy_35_2hd_empty_active.ico diff --git a/src/ICONS/floppy_525_1dd.ico b/src/WIN/ICONS/floppy_525_1dd.ico similarity index 100% rename from src/ICONS/floppy_525_1dd.ico rename to src/WIN/ICONS/floppy_525_1dd.ico diff --git a/src/ICONS/floppy_525_1dd_active.ico b/src/WIN/ICONS/floppy_525_1dd_active.ico similarity index 100% rename from src/ICONS/floppy_525_1dd_active.ico rename to src/WIN/ICONS/floppy_525_1dd_active.ico diff --git a/src/ICONS/floppy_525_1dd_empty.ico b/src/WIN/ICONS/floppy_525_1dd_empty.ico similarity index 100% rename from src/ICONS/floppy_525_1dd_empty.ico rename to src/WIN/ICONS/floppy_525_1dd_empty.ico diff --git a/src/ICONS/floppy_525_1dd_empty_active.ico b/src/WIN/ICONS/floppy_525_1dd_empty_active.ico similarity index 100% rename from src/ICONS/floppy_525_1dd_empty_active.ico rename to src/WIN/ICONS/floppy_525_1dd_empty_active.ico diff --git a/src/ICONS/floppy_525_2dd.ico b/src/WIN/ICONS/floppy_525_2dd.ico similarity index 100% rename from src/ICONS/floppy_525_2dd.ico rename to src/WIN/ICONS/floppy_525_2dd.ico diff --git a/src/ICONS/floppy_525_2dd_active.ico b/src/WIN/ICONS/floppy_525_2dd_active.ico similarity index 100% rename from src/ICONS/floppy_525_2dd_active.ico rename to src/WIN/ICONS/floppy_525_2dd_active.ico diff --git a/src/ICONS/floppy_525_2dd_empty.ico b/src/WIN/ICONS/floppy_525_2dd_empty.ico similarity index 100% rename from src/ICONS/floppy_525_2dd_empty.ico rename to src/WIN/ICONS/floppy_525_2dd_empty.ico diff --git a/src/ICONS/floppy_525_2dd_empty_active.ico b/src/WIN/ICONS/floppy_525_2dd_empty_active.ico similarity index 100% rename from src/ICONS/floppy_525_2dd_empty_active.ico rename to src/WIN/ICONS/floppy_525_2dd_empty_active.ico diff --git a/src/ICONS/floppy_525_2hd.ico b/src/WIN/ICONS/floppy_525_2hd.ico similarity index 100% rename from src/ICONS/floppy_525_2hd.ico rename to src/WIN/ICONS/floppy_525_2hd.ico diff --git a/src/ICONS/floppy_525_2hd_active.ico b/src/WIN/ICONS/floppy_525_2hd_active.ico similarity index 100% rename from src/ICONS/floppy_525_2hd_active.ico rename to src/WIN/ICONS/floppy_525_2hd_active.ico diff --git a/src/ICONS/floppy_525_2hd_empty.ico b/src/WIN/ICONS/floppy_525_2hd_empty.ico similarity index 100% rename from src/ICONS/floppy_525_2hd_empty.ico rename to src/WIN/ICONS/floppy_525_2hd_empty.ico diff --git a/src/ICONS/floppy_525_2hd_empty_active.ico b/src/WIN/ICONS/floppy_525_2hd_empty_active.ico similarity index 100% rename from src/ICONS/floppy_525_2hd_empty_active.ico rename to src/WIN/ICONS/floppy_525_2hd_empty_active.ico diff --git a/src/ICONS/floppy_525_2qd.ico b/src/WIN/ICONS/floppy_525_2qd.ico similarity index 100% rename from src/ICONS/floppy_525_2qd.ico rename to src/WIN/ICONS/floppy_525_2qd.ico diff --git a/src/ICONS/floppy_525_2qd_active.ico b/src/WIN/ICONS/floppy_525_2qd_active.ico similarity index 100% rename from src/ICONS/floppy_525_2qd_active.ico rename to src/WIN/ICONS/floppy_525_2qd_active.ico diff --git a/src/ICONS/floppy_525_2qd_empty.ico b/src/WIN/ICONS/floppy_525_2qd_empty.ico similarity index 100% rename from src/ICONS/floppy_525_2qd_empty.ico rename to src/WIN/ICONS/floppy_525_2qd_empty.ico diff --git a/src/ICONS/floppy_525_2qd_empty_active.ico b/src/WIN/ICONS/floppy_525_2qd_empty_active.ico similarity index 100% rename from src/ICONS/floppy_525_2qd_empty_active.ico rename to src/WIN/ICONS/floppy_525_2qd_empty_active.ico diff --git a/src/ICONS/floppy_disabled.ico b/src/WIN/ICONS/floppy_disabled.ico similarity index 100% rename from src/ICONS/floppy_disabled.ico rename to src/WIN/ICONS/floppy_disabled.ico diff --git a/src/ICONS/hard_disk.ico b/src/WIN/ICONS/hard_disk.ico similarity index 100% rename from src/ICONS/hard_disk.ico rename to src/WIN/ICONS/hard_disk.ico diff --git a/src/ICONS/hard_disk_active.ico b/src/WIN/ICONS/hard_disk_active.ico similarity index 100% rename from src/ICONS/hard_disk_active.ico rename to src/WIN/ICONS/hard_disk_active.ico diff --git a/src/ICONS/hard_disk_ide.ico b/src/WIN/ICONS/hard_disk_ide.ico similarity index 100% rename from src/ICONS/hard_disk_ide.ico rename to src/WIN/ICONS/hard_disk_ide.ico diff --git a/src/ICONS/hard_disk_ide_active.ico b/src/WIN/ICONS/hard_disk_ide_active.ico similarity index 100% rename from src/ICONS/hard_disk_ide_active.ico rename to src/WIN/ICONS/hard_disk_ide_active.ico diff --git a/src/ICONS/hard_disk_mfm.ico b/src/WIN/ICONS/hard_disk_mfm.ico similarity index 100% rename from src/ICONS/hard_disk_mfm.ico rename to src/WIN/ICONS/hard_disk_mfm.ico diff --git a/src/ICONS/hard_disk_mfm_active.ico b/src/WIN/ICONS/hard_disk_mfm_active.ico similarity index 100% rename from src/ICONS/hard_disk_mfm_active.ico rename to src/WIN/ICONS/hard_disk_mfm_active.ico diff --git a/src/ICONS/hard_disk_removable_scsi.ico b/src/WIN/ICONS/hard_disk_removable_scsi.ico similarity index 100% rename from src/ICONS/hard_disk_removable_scsi.ico rename to src/WIN/ICONS/hard_disk_removable_scsi.ico diff --git a/src/ICONS/hard_disk_removable_scsi_active.ico b/src/WIN/ICONS/hard_disk_removable_scsi_active.ico similarity index 100% rename from src/ICONS/hard_disk_removable_scsi_active.ico rename to src/WIN/ICONS/hard_disk_removable_scsi_active.ico diff --git a/src/ICONS/hard_disk_removable_scsi_empty.ico b/src/WIN/ICONS/hard_disk_removable_scsi_empty.ico similarity index 100% rename from src/ICONS/hard_disk_removable_scsi_empty.ico rename to src/WIN/ICONS/hard_disk_removable_scsi_empty.ico diff --git a/src/ICONS/hard_disk_removable_scsi_empty_active.ico b/src/WIN/ICONS/hard_disk_removable_scsi_empty_active.ico similarity index 100% rename from src/ICONS/hard_disk_removable_scsi_empty_active.ico rename to src/WIN/ICONS/hard_disk_removable_scsi_empty_active.ico diff --git a/src/ICONS/hard_disk_rll.ico b/src/WIN/ICONS/hard_disk_rll.ico similarity index 100% rename from src/ICONS/hard_disk_rll.ico rename to src/WIN/ICONS/hard_disk_rll.ico diff --git a/src/ICONS/hard_disk_rll_active.ico b/src/WIN/ICONS/hard_disk_rll_active.ico similarity index 100% rename from src/ICONS/hard_disk_rll_active.ico rename to src/WIN/ICONS/hard_disk_rll_active.ico diff --git a/src/ICONS/hard_disk_scsi.ico b/src/WIN/ICONS/hard_disk_scsi.ico similarity index 100% rename from src/ICONS/hard_disk_scsi.ico rename to src/WIN/ICONS/hard_disk_scsi.ico diff --git a/src/ICONS/hard_disk_scsi_active.ico b/src/WIN/ICONS/hard_disk_scsi_active.ico similarity index 100% rename from src/ICONS/hard_disk_scsi_active.ico rename to src/WIN/ICONS/hard_disk_scsi_active.ico diff --git a/src/ICONS/hard_disk_xtide.ico b/src/WIN/ICONS/hard_disk_xtide.ico similarity index 100% rename from src/ICONS/hard_disk_xtide.ico rename to src/WIN/ICONS/hard_disk_xtide.ico diff --git a/src/ICONS/hard_disk_xtide_active.ico b/src/WIN/ICONS/hard_disk_xtide_active.ico similarity index 100% rename from src/ICONS/hard_disk_xtide_active.ico rename to src/WIN/ICONS/hard_disk_xtide_active.ico diff --git a/src/ICONS/input_devices.ico b/src/WIN/ICONS/input_devices.ico similarity index 100% rename from src/ICONS/input_devices.ico rename to src/WIN/ICONS/input_devices.ico diff --git a/src/ICONS/machine.ico b/src/WIN/ICONS/machine.ico similarity index 100% rename from src/ICONS/machine.ico rename to src/WIN/ICONS/machine.ico diff --git a/src/ICONS/network.ico b/src/WIN/ICONS/network.ico similarity index 100% rename from src/ICONS/network.ico rename to src/WIN/ICONS/network.ico diff --git a/src/ICONS/other_peripherals.ico b/src/WIN/ICONS/other_peripherals.ico similarity index 100% rename from src/ICONS/other_peripherals.ico rename to src/WIN/ICONS/other_peripherals.ico diff --git a/src/ICONS/removable_devices.ico b/src/WIN/ICONS/removable_devices.ico similarity index 100% rename from src/ICONS/removable_devices.ico rename to src/WIN/ICONS/removable_devices.ico diff --git a/src/ICONS/sound.ico b/src/WIN/ICONS/sound.ico similarity index 100% rename from src/ICONS/sound.ico rename to src/WIN/ICONS/sound.ico diff --git a/src/ICONS/video.ico b/src/WIN/ICONS/video.ico similarity index 100% rename from src/ICONS/video.ico rename to src/WIN/ICONS/video.ico diff --git a/src/WIN/pcap_if.rc b/src/WIN/pcap_if.rc index 57d78e657..dd4a8f120 100644 --- a/src/WIN/pcap_if.rc +++ b/src/WIN/pcap_if.rc @@ -5,12 +5,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 +/* + * Icons by Devcore + * - https://commons.wikimedia.org/wiki/File:Icon_PC_256x256.png + */ #ifdef RELEASE_BUILD -/* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC_256x256.png */ -100 ICON DISCARDABLE "ICONS/86Box-RB.ico" +100 ICON DISCARDABLE "WIN/ICONS/86Box-RB.ico" #else -/* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC2_256x256.png */ -100 ICON DISCARDABLE "ICONS/86Box.ico" +100 ICON DISCARDABLE "WIN/ICONS/86Box.ico" #endif diff --git a/src/WIN/resource.h b/src/WIN/resource.h index fdc53b649..a9d14e0b4 100644 --- a/src/WIN/resource.h +++ b/src/WIN/resource.h @@ -83,40 +83,197 @@ #define IDC_CHECK_CDROM_2_AUDIO_ENABLED 1585 #define IDC_CHECK_CDROM_3_AUDIO_ENABLED 1586 #define IDC_CHECK_CDROM_4_AUDIO_ENABLED 1587 -#define IDS_STRING2049 2049 -#define IDS_STRING2050 2050 -#define IDS_STRING2051 2051 -#define IDS_STRING2052 2052 -#define IDS_STRING2053 2053 -#define IDS_STRING2054 2054 -#define IDS_STRING2055 2055 -#define IDS_STRING2056 2056 -#define IDS_STRING2057 2057 -#define IDS_STRING2058 2058 -#define IDS_STRING2059 2059 -#define IDS_STRING2060 2060 -#define IDS_STRING2061 2061 -#define IDS_STRING2062 2062 -#define IDS_STRING2063 2063 -#define IDS_STRING2064 2064 -#define IDS_STRING2065 2065 -#define IDS_STRING2066 2066 -#define IDS_STRING2067 2067 -#define IDS_STRING2068 2068 -#define IDS_STRING2069 2069 -#define IDS_STRING2070 2070 -#define IDS_STRING2071 2071 -#define IDS_STRING2072 2072 -#define IDS_STRING2073 2073 -#define IDS_STRING2074 2074 -#define IDS_STRING2075 2075 -#define IDS_STRING2076 2076 -#define IDS_STRING2077 2077 -#define IDS_STRING2078 2078 -#define IDS_STRING2079 2079 -#define IDM_ABOUT 40001 -#define IDC_ABOUT_ICON 65535 +#define IDS_STRINGS 2048 +#define IDS_2049 2049 +#define IDS_2050 2050 +#define IDS_2051 2051 +#define IDS_2052 2052 +#define IDS_2053 2053 +#define IDS_2054 2054 +#define IDS_2055 2055 +#define IDS_2056 2056 +#define IDS_2057 2057 +#define IDS_2058 2058 +#define IDS_2059 2059 +#define IDS_2060 2060 +#define IDS_2061 2061 +#define IDS_2062 2062 +#define IDS_2063 2063 +#define IDS_2064 2064 +#define IDS_2065 2065 +#define IDS_2066 2066 +#define IDS_2067 2067 +#define IDS_2068 2068 +#define IDS_2069 2069 +#define IDS_2070 2070 +#define IDS_2071 2071 +#define IDS_2072 2072 +#define IDS_2073 2073 +#define IDS_2074 2074 +#define IDS_2075 2075 +#define IDS_2076 2076 +#define IDS_2077 2077 +#define IDS_2078 2078 +#define IDS_2079 2079 +#define IDS_2080 2080 +#define IDS_2081 2081 +#define IDS_2082 2082 +#define IDS_2083 2083 +#define IDS_2084 2084 +#define IDS_2085 2085 +#define IDS_2086 2086 +#define IDS_2087 2087 +#define IDS_2088 2088 +#define IDS_2089 2089 +#define IDS_2090 2090 +#define IDS_2091 2091 +#define IDS_2092 2092 +#define IDS_2093 2093 +#define IDS_2094 2094 +#define IDS_2095 2095 +#define IDS_2096 2096 +#define IDS_2097 2097 +#define IDS_2098 2098 +#define IDS_2099 2099 +#define IDS_2100 2100 +#define IDS_2101 2101 +#define IDS_2102 2102 +#define IDS_2103 2103 +#define IDS_2104 2104 +#define IDS_2105 2105 +#define IDS_2106 2106 +#define IDS_2107 2107 +#define IDS_2108 2108 +#define IDS_2109 2109 +#define IDS_2110 2110 +#define IDS_2111 2111 +#define IDS_2112 2112 +#define IDS_2113 2113 +#define IDS_2114 2114 +#define IDS_2115 2115 +#define IDS_2116 2116 +#define IDS_2117 2117 +#define IDS_2118 2118 +#define IDS_2119 2119 +#define IDS_2120 2120 +#define IDS_2121 2121 +#define IDS_2122 2122 +#define IDS_2123 2123 +#define IDS_2124 2124 +#define IDS_2125 2125 +#define IDS_2126 2126 +#define IDS_2127 2127 +#define IDS_2128 2128 +#define IDS_2129 2129 +#define IDS_2130 2130 +#define IDS_2131 2131 +#define IDS_2132 2132 +#define IDS_2133 2133 +#define IDS_2134 2134 +#define IDS_2135 2135 +#define IDS_2136 2136 +#define IDS_2137 2137 +#define IDS_2138 2138 +#define IDS_2139 2139 +#define IDS_2140 2140 +#define IDS_2141 2141 +#define IDS_2142 2142 +#define IDS_2143 2143 +#define IDS_2144 2144 +#define IDS_2145 2145 +#define IDS_2146 2146 +#define IDS_2147 2147 +#define IDS_2148 2148 +#define IDS_2149 2149 +#define IDS_2150 2150 +#define IDS_2151 2151 +#define IDS_2152 2152 +#define IDS_2153 2153 +#define IDS_2154 2154 +#define IDS_2155 2155 +#define IDS_2156 2156 +#define IDS_2157 2157 +#define IDS_2158 2158 +#define IDS_2159 2159 +#define IDS_2160 2160 +#define IDS_2161 2161 +#define IDS_2162 2162 +#define IDS_2163 2163 +#define IDS_2164 2164 +#define IDS_2165 2165 +#define IDS_2166 2166 +#define IDS_2167 2167 +#define IDS_2168 2168 +#define IDS_2169 2169 +#define IDS_2170 2170 +#define IDS_2171 2171 +#define IDS_2172 2172 +#define IDS_2173 2173 +#define IDS_2174 2174 +#define IDS_2175 2175 +#define IDS_2176 2176 +#define IDS_2177 2177 +#define IDS_2178 2178 +#define IDS_2179 2179 +#define IDS_2180 2180 +#define IDS_2181 2181 +#define IDS_2182 2182 +#define IDS_2183 2183 +#define IDS_2184 2184 +#define IDS_2185 2185 +#define IDS_2186 2186 +#define IDS_2187 2187 +#define IDS_2188 2188 +#define IDS_2189 2189 +#define IDS_2190 2190 +#define IDS_2191 2191 +#define IDS_2192 2192 +#define IDS_2193 2193 +#define IDS_2194 2194 +#define IDS_2195 2195 +#define IDS_2196 2196 +#define IDS_2197 2197 +#define IDS_2198 2198 +#define IDS_2199 2199 +#define IDS_2200 2200 +#define IDS_2201 2201 +#define IDS_2202 2202 +#define IDS_2203 2203 +#define IDS_2204 2204 +#define IDS_2205 2205 +#define IDS_2206 2206 +#define IDS_2207 2207 +#define IDS_2208 2208 +#define IDS_2209 2209 +#define IDS_2200 2200 +#define IDS_2201 2201 +#define IDS_2202 2202 +#define IDS_2203 2203 +#define IDS_2204 2204 +#define IDS_2205 2205 +#define IDS_2206 2206 +#define IDS_2207 2207 +#define IDS_2208 2208 +#define IDS_2209 2209 +#define IDS_2210 2210 +#define IDS_2211 2211 +#define IDS_2212 2212 +#define IDS_2213 2213 +#define IDS_2214 2214 +#define IDS_2215 2215 +#define IDS_2216 2216 +#define IDS_2217 2217 +#define IDS_2218 2218 +#define IDS_2219 2219 +#define IDS_2220 2220 +#define IDS_2221 2221 + +#define IDS_LANG_ENUS IDS_2221 + + +#define IDM_ABOUT 40001 +#define IDC_ABOUT_ICON 65535 #define IDM_FILE_RESET 40015 #define IDM_FILE_HRESET 40016 #define IDM_FILE_EXIT 40017 diff --git a/src/WIN/win.c b/src/WIN/win.c index 3abbcf894..6c25ddfa3 100644 --- a/src/WIN/win.c +++ b/src/WIN/win.c @@ -1518,7 +1518,7 @@ int WINAPI WinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPSTR lpsz } if (c == ROM_MAX) { - msgbox_critical(ghwnd, 2062); + msgbox_critical(ghwnd, IDS_2062); return 0; } @@ -1529,7 +1529,7 @@ int WINAPI WinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPSTR lpsz { if (romset!=-1) { - msgbox_info(ghwnd, 2063); + msgbox_info(ghwnd, IDS_2063); } for (c=0;c= 0; c--) { @@ -1870,7 +1870,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM if (video_fullscreen_first) { video_fullscreen_first = 0; - msgbox_info(ghwnd, 2193); + msgbox_info(ghwnd, IDS_2193); } startblit(); @@ -1984,7 +1984,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM case IDM_CONFIG_LOAD: pause = 1; - if (!file_dlg_st(hwnd, 2174, "", 0)) + if (!file_dlg_st(hwnd, IDS_2174, "", 0)) { if (msgbox_reset_yn(ghwnd) == IDYES) { @@ -2001,7 +2001,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM case IDM_CONFIG_SAVE: pause = 1; - if (!file_dlg_st(hwnd, 2174, "", 1)) + if (!file_dlg_st(hwnd, IDS_2174, "", 1)) { config_save(wopenfilestring); } @@ -2231,7 +2231,7 @@ LRESULT CALLBACK StatusBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPAR break; } - ret = file_dlg_w_st(hwnd, 2173, discfns[id], id); + ret = file_dlg_w_st(hwnd, IDS_2173, discfns[id], id); if (!ret) { disc_close(id); @@ -2287,7 +2287,7 @@ LRESULT CALLBACK StatusBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPAR break; } - if (!file_dlg_w_st(hwnd, 2175, cdrom_image[id].image_path, 0)) + if (!file_dlg_w_st(hwnd, IDS_2175, cdrom_image[id].image_path, 0)) { cdrom_drives[id].prev_host_drive = cdrom_drives[id].host_drive; wcscpy(temp_image_path, wopenfilestring); @@ -2376,7 +2376,7 @@ LRESULT CALLBACK StatusBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPAR case IDM_RDISK_IMAGE: case IDM_RDISK_IMAGE_WP: id = item_params & 0x001f; - ret = file_dlg_w_st(hwnd, 2172, hdc[id].fn, id); + ret = file_dlg_w_st(hwnd, IDS_2172, hdc[id].fn, id); if (!ret) { removable_disk_unload(id); diff --git a/src/WIN/win.h b/src/WIN/win.h index f36b487e5..a5a8b9918 100644 --- a/src/WIN/win.h +++ b/src/WIN/win.h @@ -18,6 +18,7 @@ # define _WIN32_WINNT 0x0501 # endif */ # include +# include "resource.h" # undef BITMAP diff --git a/src/WIN/win_settings.c b/src/WIN/win_settings.c index 84a6a0645..76a4ebfb5 100644 --- a/src/WIN/win_settings.c +++ b/src/WIN/win_settings.c @@ -2454,7 +2454,7 @@ static BOOL CALLBACK win_settings_hard_disks_add_proc(HWND hdlg, UINT message, W if ((wcslen(hd_file_name) == 0) && (hdc_ptr->bus != HDD_BUS_SCSI_REMOVABLE)) { hdc_ptr->bus = HDD_BUS_DISABLED; - msgbox_error(hwndParentDialog, 2056); + msgbox_error(hwndParentDialog, IDS_2056); return TRUE; } else if ((wcslen(hd_file_name) == 0) && (hdc_ptr->bus == HDD_BUS_SCSI_REMOVABLE)) @@ -2526,7 +2526,7 @@ static BOOL CALLBACK win_settings_hard_disks_add_proc(HWND hdlg, UINT message, W if (size >= 0x100000000ll) { fclose(f); - msgbox_error(hwndParentDialog, 2058); + msgbox_error(hwndParentDialog, IDS_2058); return TRUE; } @@ -2549,7 +2549,7 @@ static BOOL CALLBACK win_settings_hard_disks_add_proc(HWND hdlg, UINT message, W if (size > 0xffffffffffffffffll) { fclose(f); - msgbox_error(hwndParentDialog, 2163); + msgbox_error(hwndParentDialog, IDS_2163); return TRUE; } @@ -2589,7 +2589,7 @@ static BOOL CALLBACK win_settings_hard_disks_add_proc(HWND hdlg, UINT message, W } fclose(f); - msgbox_info(hwndParentDialog, 2059); + msgbox_info(hwndParentDialog, IDS_2059); } hd_add_ok_common: @@ -2615,7 +2615,7 @@ hd_add_ok_common: if (f != NULL) { fclose(f); - if (msgbox_question(ghwnd, 2178) != IDYES) + if (msgbox_question(ghwnd, IDS_2178) != IDYES) { return FALSE; } @@ -2637,7 +2637,7 @@ hdd_add_file_open_error: fread(§or_size, 1, 4, f); if (sector_size != 512) { - msgbox_error(hwndParentDialog, 2061); + msgbox_error(hwndParentDialog, IDS_2061); fclose(f); return TRUE; } @@ -4047,7 +4047,7 @@ static BOOL CALLBACK win_settings_main_proc(HWND hdlg, UINT message, WPARAM wPar h = GetDlgItem(hdlg, IDC_COMBO_LANG); /* This is currently disabled, I am going to add localization options in the future. */ EnableWindow(h, FALSE); ShowWindow(h, SW_HIDE); - h = GetDlgItem(hdlg, 2047); + h = GetDlgItem(hdlg, IDS_LANG_ENUS); /*was:2047 !*/ EnableWindow(h, FALSE); ShowWindow(h, SW_HIDE); return TRUE; diff --git a/src/config.c b/src/config.c index 550f442fe..26edf34ee 100644 --- a/src/config.c +++ b/src/config.c @@ -1011,11 +1011,11 @@ static void loadconfig_network(void) { if ((network_ndev == 1) && strcmp(network_pcap, "none")) { - msgbox_error(ghwnd, 2107); + msgbox_error(ghwnd, IDS_2107); } else if (network_dev_to_id(p) == -1) { - msgbox_error(ghwnd, 2200); + msgbox_error(ghwnd, IDS_2200); } strcpy(network_pcap, "none"); @@ -1173,14 +1173,14 @@ static int config_string_to_bus(char *str, int cdrom) if (!strcmp(str, "usb")) { - msgbox_error(ghwnd, 2199); + msgbox_error(ghwnd, IDS_2199); return 0; } return 0; no_mfm_cdrom: - msgbox_error(ghwnd, 2095); + msgbox_error(ghwnd, IDS_2095); return 0; } diff --git a/src/network.c b/src/network.c index a707be3b0..be58eaac2 100644 --- a/src/network.c +++ b/src/network.c @@ -12,7 +12,7 @@ * it should be malloc'ed and then linked to the NETCARD def. * Will be done later. * - * Version: @(#)network.c 1.0.6 2017/05/22 + * Version: @(#)network.c 1.0.7 2017/05/29 * * Authors: Kotori, * Fred N. van Kempen, @@ -78,7 +78,8 @@ network_init(void) if (i > 0) network_ndev += i; - if (network_type != NET_TYPE_PCAP) network_pcap_close(); + if (network_type != NET_TYPE_PCAP) + network_pcap_close(); } @@ -105,7 +106,7 @@ network_attach(void *dev, uint8_t *mac, NETRXCB rx) case NET_TYPE_PCAP: ret = network_pcap_setup(mac, rx, dev); if (ret < 0) { - msgbox_error(ghwnd, 2219); + msgbox_error(ghwnd, IDS_2219); network_type = NET_TYPE_NONE; } break;