Merge branch '86Box:master' into changeable_icon_set

This commit is contained in:
Laci bá
2021-11-17 18:32:21 +01:00
committed by GitHub
13 changed files with 1342 additions and 23 deletions

View File

@@ -1,7 +1,7 @@
DLG_PROG_SETT DIALOG DISCARDABLE 0, 0, 240, 118
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION STR_PROG_SETT
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
DEFPUSHBUTTON STR_OK, IDOK, 123, 97, 50, 14
PUSHBUTTON STR_CANCEL, IDCANCEL, 179, 97, 50, 14
@@ -17,7 +17,7 @@ END
DLG_SND_GAIN DIALOG DISCARDABLE 0, 0, 113, 136
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION STR_SND_GAIN
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
DEFPUSHBUTTON STR_OK,IDOK,57,7,50,14
PUSHBUTTON STR_CANCEL,IDCANCEL,57,24,50,14
@@ -29,7 +29,7 @@ END
DLG_NEW_FLOPPY DIALOG DISCARDABLE 0, 0, 226, 86
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION STR_NEW_FLOPPY
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
DEFPUSHBUTTON STR_OK,IDOK,104,65,50,14
PUSHBUTTON STR_CANCEL,IDCANCEL,162,65,50,14
@@ -50,7 +50,7 @@ END
DLG_CONFIG DIALOG DISCARDABLE 0, 0, 376, 256
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION STR_CONFIG
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
DEFPUSHBUTTON STR_OK,IDOK,246,235,50,14
PUSHBUTTON STR_CANCEL,IDCANCEL,307,235,50,14
@@ -62,7 +62,7 @@ END
DLG_SPECIFY_DIM DIALOG DISCARDABLE 0, 0, 175, 66
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION STR_SPECIFY_DIM
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
LTEXT STR_WIDTH,IDT_1709,7,9,24,12
EDITTEXT IDC_EDIT_WIDTH,33,7,45,12,ES_AUTOHSCROLL | ES_NUMBER
@@ -82,7 +82,7 @@ END
DLG_CFG_MACHINE DIALOG DISCARDABLE 107, 0, 305, 200
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
COMBOBOX IDC_COMBO_MACHINE_TYPE,71,7,189,120,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
@@ -118,13 +118,13 @@ BEGIN
BS_AUTORADIOBUTTON | WS_TABSTOP,14,175,84,10
#ifdef USE_DYNAREC
CONTROL STR_DYNAREC,IDC_CHECK_DYNAREC,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,120,94,10
BS_AUTOCHECKBOX | WS_TABSTOP,7,120,120,10
#endif
END
DLG_CFG_VIDEO DIALOG DISCARDABLE 107, 0, 267, 45
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
LTEXT STR_VIDEO,IDT_1707,7,9,48,10
COMBOBOX IDC_COMBO_VIDEO,64,7,155,120,CBS_DROPDOWNLIST |
@@ -137,7 +137,7 @@ END
DLG_CFG_INPUT DIALOG DISCARDABLE 107, 0, 267, 65
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
LTEXT STR_MOUSE,IDT_1709,7,9,57,10
COMBOBOX IDC_COMBO_MOUSE,71,7,140,120,CBS_DROPDOWNLIST |
@@ -154,7 +154,7 @@ END
DLG_CFG_SOUND DIALOG DISCARDABLE 107, 0, 267, 201
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
COMBOBOX IDC_COMBO_SOUND,71,7,140,120,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
@@ -193,7 +193,7 @@ END
DLG_CFG_NETWORK DIALOG DISCARDABLE 107, 0, 267, 65
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
LTEXT STR_NET_TYPE,IDT_1714,7,9,59,10
COMBOBOX IDC_COMBO_NET_TYPE,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL |
@@ -211,7 +211,7 @@ END
DLG_CFG_PORTS DIALOG DISCARDABLE 107, 0, 267, 135
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
LTEXT STR_LPT1,IDT_1717,7,9,61,10
COMBOBOX IDC_COMBO_LPT1,71,7,189,120,CBS_DROPDOWNLIST |
@@ -244,7 +244,7 @@ END
DLG_CFG_STORAGE DIALOG DISCARDABLE 107, 0, 267, 203
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
LTEXT STR_HDC,IDT_1718,7,9,64,10
COMBOBOX IDC_COMBO_HDC,64,7,155,120,CBS_DROPDOWNLIST |
@@ -288,7 +288,7 @@ END
DLG_CFG_HARD_DISKS DIALOG DISCARDABLE 107, 0, 267, 154
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
CONTROL "List1",IDC_LIST_HARD_DISKS,"SysListView32",LVS_REPORT |
LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER |
@@ -313,7 +313,7 @@ END
DLG_CFG_HARD_DISKS_ADD DIALOG DISCARDABLE 0, 0, 219, 149
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Add Hard Disk"
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
DEFPUSHBUTTON STR_OK,IDOK,55,127,50,14
PUSHBUTTON STR_CANCEL,IDCANCEL,112,127,50,14
@@ -355,7 +355,7 @@ END
DLG_CFG_FLOPPY_AND_CDROM_DRIVES DIALOG DISCARDABLE 107, 0, 267, 222
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
CONTROL "List1",IDC_LIST_FLOPPY_DRIVES,"SysListView32",
LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER |
@@ -389,14 +389,14 @@ END
DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE 107, 0, 267, 222
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
CONTROL "List1",IDC_LIST_MO_DRIVES,"SysListView32",LVS_REPORT |
LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP,7,17,253,60
LTEXT STR_MO_DRIVES,IDT_1769,7,7,253,8
COMBOBOX IDC_COMBO_MO_BUS,33,85,90,12,CBS_DROPDOWNLIST |
COMBOBOX IDC_COMBO_MO_BUS,33,85,80,12,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
LTEXT STR_BUS,IDT_1770,7,87,24,8
COMBOBOX IDC_COMBO_MO_ID,170,85,90,12,CBS_DROPDOWNLIST |
@@ -413,9 +413,9 @@ BEGIN
LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP,7,137,253,60
LTEXT STR_ZIP_DRIVES,IDT_1759,7,127,253,8
COMBOBOX IDC_COMBO_ZIP_BUS,23,205,90,12,CBS_DROPDOWNLIST |
COMBOBOX IDC_COMBO_ZIP_BUS,33,205,80,12,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
LTEXT STR_BUS,IDT_1753,7,207,14,8
LTEXT STR_BUS,IDT_1753,7,207,24,8
COMBOBOX IDC_COMBO_ZIP_ID,149,205,61,12,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
LTEXT STR_ID,IDT_1754,120,207,28,8
@@ -428,7 +428,7 @@ END
DLG_CFG_PERIPHERALS DIALOG DISCARDABLE 107, 0, 267, 154
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
FONT FONT_SIZE, FONT_NAME
BEGIN
LTEXT STR_ISARTC,IDT_1767,7,9,48,10
COMBOBOX IDC_COMBO_ISARTC,64,7,155,120,
@@ -578,3 +578,6 @@ END
#undef STR_ISAMEM_4
#undef STR_BUGGER
#undef STR_POSTCARD
#undef FONT_SIZE
#undef FONT_NAME