claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the MO icons to proper ones, added cassette icons, merged the Floppy drives and CD-ROM drives section of the Settings dialog into one, and changed the configuration file format accordingly with a backward compatibility measure added to correctly load older configuration files.

Browse Source
This commit is contained in:
OBattler
2020-07-19 06:07:58 +02:00
parent 6ba0d715cc
commit 5aec4ef147
22 changed files with 545 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/include/86box/language.h
View File

@@ -46,7 +46,7 @@
#define IDS_2070 2070 // "Ports (COM & LPT)"
#define IDS_2071 2071 // "Other peripherals"
#define IDS_2072 2072 // "Hard disks"
#define IDS_2073 2073 // "Floppy drives"
#define IDS_2073 2073 // "Floppy and CD-ROM drives"
#define IDS_2074 2074 // "Other removable devices"
#define IDS_2075 2075 // "CD-ROM images (*.ISO;*.CU.."
#define IDS_2076 2076 // "Surface-based images (*.8.."
@@ -112,7 +112,6 @@
#define IDS_2136 2136 // "Don't Exit"
#define IDS_2137 2137 // "Reset"
#define IDS_2138 2138 // "Don't Reset"
#define IDS_2139 2139 // "CD-ROM drives"
#define IDS_4096 4096 // "Hard disk (%s)"
#define IDS_4097 4097 // "%01i:%01i"
@@ -189,6 +188,16 @@
#define IDS_5899 5899 // "2.88 MB"
#define IDS_5900 5900 // "ZIP 100"
#define IDS_5901 5901 // "ZIP 250"
#define IDS_5902 5902 // "3.5\" 128Mb M.O. (ISO 10090)"
#define IDS_5903 5903 // "3.5\" 230Mb M.O. (ISO 13963)"
#define IDS_5904 5904 // "3.5\" 540Mb M.O. (ISO 15498)"
#define IDS_5905 5905 // "3.5\" 640Mb M.O. (ISO 15498)"
#define IDS_5906 5906 // "3.5\" 1.3Gb M.O. (GigaMO)"
#define IDS_5907 5907 // "3.5\" 2.3Gb M.O. (GigaMO 2)"
#define IDS_5908 5908 // "5.25\" 600Mb M.O."
#define IDS_5909 5909 // "5.25\" 650Mb M.O."
#define IDS_5910 5910 // "5.25\" 1Gb M.O."
#define IDS_5911 5911 // "5.25\" 1.3Gb M.O."
#define IDS_6144 6144 // "Perfect RPM"
#define IDS_6145 6145 // "1%% below perfect RPM"
@@ -199,7 +208,7 @@
#define IDS_LANG_ENUS IDS_7168
#define STR_NUM_2048 92
#define STR_NUM_2048 91
#define STR_NUM_3072 11
#define STR_NUM_4096 18
#define STR_NUM_4352 7
@@ -207,7 +216,7 @@
#define STR_NUM_5120 1
#define STR_NUM_5376 7
#define STR_NUM_5632 7
#define STR_NUM_5888 14
#define STR_NUM_5888 24
#define STR_NUM_6144 4
#define STR_NUM_7168 1

19
src/include/86box/mo.h
View File

@@ -104,17 +104,16 @@ typedef struct {
media status. */
pad, pad0;
uint32_t medium_size,
base;
uint16_t sector_size;
uint8_t type;
void *priv;
FILE *f;
void *priv;
wchar_t image_path[1024],
prev_image_path[1024];
uint32_t type, medium_size,
base;
uint16_t sector_size;
} mo_drive_t;
typedef struct {
@@ -135,9 +134,9 @@ typedef struct {
uint16_t request_length, max_transfer_len;
int requested_blocks, packet_status,
total_length, do_page_save,
unit_attention, request_pos,
old_len, pad3;
total_length, do_page_save,
unit_attention, request_pos,
old_len, pad3;
uint32_t sector_pos, sector_len,
packet_len, pos;

30
src/include/86box/resource.h
View File

@@ -38,9 +38,8 @@
#define DLG_CFG_PERIPHERALS 117 /* sub-dialog of config */
#define DLG_CFG_HARD_DISKS 118 /* sub-dialog of config */
#define DLG_CFG_HARD_DISKS_ADD 119 /* sub-dialog of config */
#define DLG_CFG_FLOPPY_DRIVES 120 /* sub-dialog of config */
#define DLG_CFG_CDROM_DRIVES 121 /* sub-dialog of config */
#define DLG_CFG_OTHER_REMOVABLE_DEVICES 122 /* sub-dialog of config */
#define DLG_CFG_FLOPPY_AND_CDROM_DRIVES 120 /* sub-dialog of config */
#define DLG_CFG_OTHER_REMOVABLE_DEVICES 121 /* sub-dialog of config */
/* Static text label IDs. */
#define IDT_1700 1700 /* Language: */
@@ -101,11 +100,11 @@
#define IDT_1766 1766 /* Board #4: */
#define IDT_1767 1767 /* ISA RTC: */
#define IDT_1768 1768 /* Ext FD Controller: */
#define IDT_1769 1769 /* MO drives: */
#define IDT_1770 1770 /* Bus: */
#define IDT_1771 1771 /* ID: */
#define IDT_1772 1772 /* Channel */
#define IDT_1773 1773 /* Type: */
#define IDT_1769 1769 /* MO drives: */
#define IDT_1770 1770 /* Bus: */
#define IDT_1771 1771 /* ID: */
#define IDT_1772 1772 /* Channel */
#define IDT_1773 1773 /* Type: */
/*
@@ -201,7 +200,7 @@
#define IDC_CONFIGURE_ISAMEM_3 1147
#define IDC_CONFIGURE_ISAMEM_4 1148
#define IDC_HARD_DISKS 1150 /* hard disk config */
#define IDC_HARD_DISKS 1150 /* hard disks config */
#define IDC_LIST_HARD_DISKS 1151
#define IDC_BUTTON_HDD_ADD_NEW 1152
#define IDC_BUTTON_HDD_ADD 1153
@@ -220,7 +219,7 @@
#define IDC_COMBO_HD_TYPE 1165
#define IDC_PBAR_IMG_CREATE 1166
#define IDC_REMOV_DEVICES 1170 /* removable dev config */
#define IDC_REMOV_DEVICES 1170 /* floppy and cd-rom drives config */
#define IDC_LIST_FLOPPY_DRIVES 1171
#define IDC_COMBO_FD_TYPE 1172
#define IDC_CHECKTURBO 1173
@@ -230,7 +229,8 @@
#define IDC_COMBO_CD_ID 1177
#define IDC_COMBO_CD_LUN 1178
#define IDC_COMBO_CD_CHANNEL_IDE 1179
#define IDC_LIST_ZIP_DRIVES 1180
#define IDC_LIST_ZIP_DRIVES 1180 /* other removable devices config */
#define IDC_COMBO_ZIP_BUS 1181
#define IDC_COMBO_ZIP_ID 1182
#define IDC_COMBO_ZIP_LUN 1183
@@ -240,11 +240,11 @@
#define IDC_LIST_MO_DRIVES 1187
#define IDC_COMBO_MO_BUS 1188
#define IDC_COMBO_MO_ID 1189
#define IDC_COMBO_MO_LUN 1191
#define IDC_COMBO_MO_CHANNEL_IDE 1192
#define IDC_COMBO_MO_TYPE 1193
#define IDC_COMBO_MO_LUN 1190
#define IDC_COMBO_MO_CHANNEL_IDE 1191
#define IDC_COMBO_MO_TYPE 1192
#define IDC_SLIDER_GAIN 1190 /* sound gain dialog */
#define IDC_SLIDER_GAIN 1193 /* sound gain dialog */
#define IDC_EDIT_FILE_NAME 1200 /* new floppy image dialog */
#define IDC_COMBO_DISK_SIZE 1201

5
src/include/86box/win.h
View File

@@ -163,9 +163,8 @@ extern void NewFloppyDialogCreate(HWND hwnd, int id, int part);
#define SETTINGS_PAGE_PORTS 5
#define SETTINGS_PAGE_PERIPHERALS 6
#define SETTINGS_PAGE_HARD_DISKS 7
#define SETTINGS_PAGE_FLOPPY_DRIVES 8
#define SETTINGS_PAGE_CDROM_DRIVES 9
#define SETTINGS_PAGE_OTHER_REMOVABLE_DEVICES 10
#define SETTINGS_PAGE_FLOPPY_AND_CDROM_DRIVES 8
#define SETTINGS_PAGE_OTHER_REMOVABLE_DEVICES 9
extern void win_settings_open(HWND hwnd);
extern void win_settings_open_ex(HWND hwnd, int category);