From bd51c6008998fc7c156438c3a6b7b82f73ede63a Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Mon, 3 Jan 2022 20:55:58 -0500 Subject: [PATCH] Widen various things --- src/win/86Box.rc | 20 ++++---- src/win/languages/dialogs.rc | 98 ++++++++++++++++++------------------ src/win/win_devconf.c | 2 +- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/win/86Box.rc b/src/win/86Box.rc index 1b48edb03..4f500e629 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -220,7 +220,7 @@ BEGIN DLG_CFG_MACHINE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 260 + RIGHTMARGIN, 300 TOPMARGIN, 7 #ifdef USE_DYNAREC BOTTOMMARGIN, 87 @@ -232,7 +232,7 @@ BEGIN DLG_CFG_VIDEO, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 260 + RIGHTMARGIN, 300 TOPMARGIN, 7 BOTTOMMARGIN, 38 END @@ -240,7 +240,7 @@ BEGIN DLG_CFG_INPUT, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 260 + RIGHTMARGIN, 300 TOPMARGIN, 7 BOTTOMMARGIN, 58 END @@ -248,7 +248,7 @@ BEGIN DLG_CFG_SOUND, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 260 + RIGHTMARGIN, 300 TOPMARGIN, 7 BOTTOMMARGIN, 109 END @@ -256,7 +256,7 @@ BEGIN DLG_CFG_NETWORK, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 260 + RIGHTMARGIN, 300 TOPMARGIN, 7 BOTTOMMARGIN, 56 END @@ -264,7 +264,7 @@ BEGIN DLG_CFG_PORTS, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 260 + RIGHTMARGIN, 300 TOPMARGIN, 7 BOTTOMMARGIN, 48 END @@ -272,7 +272,7 @@ BEGIN DLG_CFG_PERIPHERALS, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 260 + RIGHTMARGIN, 300 TOPMARGIN, 7 BOTTOMMARGIN, 85 END @@ -280,7 +280,7 @@ BEGIN DLG_CFG_HARD_DISKS, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 260 + RIGHTMARGIN, 300 TOPMARGIN, 7 BOTTOMMARGIN, 137 END @@ -288,7 +288,7 @@ BEGIN DLG_CFG_FLOPPY_DRIVES, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 260 + RIGHTMARGIN, 300 TOPMARGIN, 7 BOTTOMMARGIN, 96 END @@ -296,7 +296,7 @@ BEGIN DLG_CFG_OTHER_REMOVABLE_DEVICES, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 260 + RIGHTMARGIN, 300 TOPMARGIN, 7 BOTTOMMARGIN, 214 END diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index 14d3512b6..e4420a516 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -47,7 +47,7 @@ BEGIN WS_BORDER,53,45,166,14 END -DLG_CONFIG DIALOG DISCARDABLE 0, 0, 376, 256 +DLG_CONFIG DIALOG DISCARDABLE 0, 0, 456, 256 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION STR_CONFIG FONT FONT_SIZE, FONT_NAME @@ -55,8 +55,8 @@ BEGIN DEFPUSHBUTTON STR_OK,IDOK,246,235,50,14 PUSHBUTTON STR_CANCEL,IDCANCEL,307,235,50,14 CONTROL "List2",IDC_SETTINGSCATLIST,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | - LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,100,212 - CONTROL "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,226,373,1 + LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,101,212 + CONTROL "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,226,454,1 END DLG_SPECIFY_DIM DIALOG DISCARDABLE 0, 0, 175, 66 @@ -80,17 +80,17 @@ BEGIN PUSHBUTTON STR_CANCEL,IDCANCEL,99,45,50,14 END -DLG_CFG_MACHINE DIALOG DISCARDABLE 107, 0, 305, 200 +DLG_CFG_MACHINE DIALOG DISCARDABLE 108, 0, 345, 200 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN COMBOBOX IDC_COMBO_MACHINE_TYPE,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MACHINE_TYPE,IDT_1708,7,9,60,10 - COMBOBOX IDC_COMBO_MACHINE,71,26,138,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_MACHINE,71,26,168,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MACHINE,IDT_1701,7,28,60,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MACHINE,214,26,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MACHINE,244,26,46,12 COMBOBOX IDC_COMBO_CPU_TYPE,71,45,110,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CPU_TYPE,IDT_1702,7,47,59,10 @@ -122,20 +122,20 @@ BEGIN #endif END -DLG_CFG_VIDEO DIALOG DISCARDABLE 107, 0, 267, 45 +DLG_CFG_VIDEO DIALOG DISCARDABLE 108, 0, 345, 45 STYLE DS_CONTROL | WS_CHILD 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 | + COMBOBOX IDC_COMBO_VIDEO,64,7,235,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_VID,222,7,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_VID,302,7,38,12 CONTROL STR_VOODOO,IDC_CHECK_VOODOO,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,27,199,10 - PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_VOODOO,222,26,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_VOODOO,302,26,38,12 END -DLG_CFG_INPUT DIALOG DISCARDABLE 107, 0, 267, 65 +DLG_CFG_INPUT DIALOG DISCARDABLE 108, 0, 345, 65 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN @@ -152,77 +152,77 @@ BEGIN PUSHBUTTON STR_JOY4,IDC_JOY4,209,44,50,14 END -DLG_CFG_SOUND DIALOG DISCARDABLE 107, 0, 267, 201 +DLG_CFG_SOUND DIALOG DISCARDABLE 108, 0, 345, 201 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - COMBOBOX IDC_COMBO_SOUND,71,7,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_SOUND,71,7,170,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_SOUND,IDT_1711,7,9,59,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SND,214,7,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SND,244,7,46,12 - COMBOBOX IDC_COMBO_MIDI,71,26,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_MIDI,71,26,170,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MIDI,IDT_1712,7,28,59,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI,214,26,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI,244,26,46,12 - COMBOBOX IDC_COMBO_MIDI_IN,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_MIDI_IN,71,45,170,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MIDI_IN,IDT_1713,7,47,59,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_IN,214,45,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_IN,244,45,46,12 CONTROL STR_MPU401,IDC_CHECK_MPU401,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,66,199,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MPU401,214,64,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MPU401,244,64,46,12 CONTROL STR_SSI,IDC_CHECK_SSI,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,84,95,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SSI,214,82,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SSI,244,82,46,12 CONTROL STR_CMS,IDC_CHECK_CMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,102,95,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_CMS,214,100,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_CMS,244,100,46,12 CONTROL STR_GUS,IDC_CHECK_GUS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,120,94,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_GUS,214,118,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_GUS,244,118,46,12 CONTROL STR_FLOAT,IDC_CHECK_FLOAT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,94,10 END -DLG_CFG_NETWORK DIALOG DISCARDABLE 107, 0, 267, 65 +DLG_CFG_NETWORK DIALOG DISCARDABLE 108, 0, 345, 65 STYLE DS_CONTROL | WS_CHILD 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 | + COMBOBOX IDC_COMBO_NET_TYPE,71,7,229,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_PCAP,IDT_1715,7,28,59,10 - COMBOBOX IDC_COMBO_PCAP,71,26,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_PCAP,71,26,229,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_NET,IDT_1716,7,47,59,10 - COMBOBOX IDC_COMBO_NET,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_NET,71,45,170,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_NET,214,44,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_NET,244,44,46,12 END -DLG_CFG_PORTS DIALOG DISCARDABLE 107, 0, 267, 135 +DLG_CFG_PORTS DIALOG DISCARDABLE 108, 0, 345, 135 STYLE DS_CONTROL | WS_CHILD 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 | + COMBOBOX IDC_COMBO_LPT1,71,7,229,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_LPT2,IDT_1718,7,28,61,10 - COMBOBOX IDC_COMBO_LPT2,71,26,189,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_LPT2,71,26,229,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_LPT3,IDT_1719,7,47,61,10 - COMBOBOX IDC_COMBO_LPT3,71,45,189,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_LPT3,71,45,229,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL STR_SERIAL1,IDC_CHECK_SERIAL1,"Button", @@ -242,27 +242,27 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,7,118,94,10 END -DLG_CFG_STORAGE DIALOG DISCARDABLE 107, 0, 267, 203 +DLG_CFG_STORAGE DIALOG DISCARDABLE 108, 0, 345, 203 STYLE DS_CONTROL | WS_CHILD 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 | + COMBOBOX IDC_COMBO_HDC,64,7,185,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_HDC,222,7,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_HDC,252,7,38,12 LTEXT STR_FDC,IDT_1768,7,28,64,10 - COMBOBOX IDC_COMBO_FDC,64,26,155,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_FDC,64,26,185,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_FDC,222,26,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_FDC,252,26,38,12 CONTROL STR_IDE_TER,IDC_CHECK_IDE_TER,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,47,199,10 - PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_IDE_TER,222,45,38,12 + BS_AUTOCHECKBOX | WS_TABSTOP,7,47,239,10 + PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_IDE_TER,252,45,38,12 CONTROL STR_IDE_QUA,IDC_CHECK_IDE_QUA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,66,199,10 - PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_IDE_QUA,222,64,38,12 + BS_AUTOCHECKBOX | WS_TABSTOP,7,66,239,10 + PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_IDE_QUA,252,64,38,12 GROUPBOX STR_SCSI,IDC_GROUP_SCSI,7,85,253,93 LTEXT STR_SCSI_1,IDT_1763,16,102,48,10 @@ -286,13 +286,13 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,7,185,94,10 END -DLG_CFG_HARD_DISKS DIALOG DISCARDABLE 107, 0, 267, 154 +DLG_CFG_HARD_DISKS DIALOG DISCARDABLE 108, 0, 345, 154 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN CONTROL "List1",IDC_LIST_HARD_DISKS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | - WS_TABSTOP,7,18,253,92 + WS_TABSTOP,7,18,283,92 LTEXT STR_HDD,IDT_1720,7,7,253,8 PUSHBUTTON STR_NEW,IDC_BUTTON_HDD_ADD_NEW,60,137,62,10 PUSHBUTTON STR_EXISTING,IDC_BUTTON_HDD_ADD,129,137,62,10 @@ -353,13 +353,13 @@ BEGIN WS_BORDER,7,16,204,12 END -DLG_CFG_FLOPPY_AND_CDROM_DRIVES DIALOG DISCARDABLE 107, 0, 267, 222 +DLG_CFG_FLOPPY_AND_CDROM_DRIVES DIALOG DISCARDABLE 108, 0, 345, 222 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN CONTROL "List1",IDC_LIST_FLOPPY_DRIVES,"SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | - WS_TABSTOP,7,18,253,60 + WS_TABSTOP,7,18,283,60 LTEXT STR_FLOPPY_DRIVES,IDT_1737,7,7,253,8 COMBOBOX IDC_COMBO_FD_TYPE,33,85,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -371,7 +371,7 @@ BEGIN CONTROL "List1",IDC_LIST_CDROM_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | - WS_TABSTOP,7,117,253,60 + WS_TABSTOP,7,117,283,60 LTEXT STR_CDROM_DRIVES,IDT_1739,7,107,253,8 COMBOBOX IDC_COMBO_CD_BUS,33,185,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -387,14 +387,14 @@ BEGIN LTEXT STR_SPEED,IDT_1758,7,207,24,8 END -DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE 107, 0, 267, 222 +DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE 108, 0, 345, 222 STYLE DS_CONTROL | WS_CHILD 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 + WS_TABSTOP,7,17,283,60 LTEXT STR_MO_DRIVES,IDT_1769,7,7,253,8 COMBOBOX IDC_COMBO_MO_BUS,33,85,80,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -411,7 +411,7 @@ BEGIN CONTROL "List1",IDC_LIST_ZIP_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | - WS_TABSTOP,7,137,253,60 + WS_TABSTOP,7,137,283,60 LTEXT STR_ZIP_DRIVES,IDT_1759,7,127,253,8 COMBOBOX IDC_COMBO_ZIP_BUS,33,205,80,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -426,7 +426,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,218,205,44,10 END -DLG_CFG_PERIPHERALS DIALOG DISCARDABLE 107, 0, 267, 154 +DLG_CFG_PERIPHERALS DIALOG DISCARDABLE 108, 0, 345, 154 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN diff --git a/src/win/win_devconf.c b/src/win/win_devconf.c index 4f4ddc639..c4de7d90b 100644 --- a/src/win/win_devconf.c +++ b/src/win/win_devconf.c @@ -471,7 +471,7 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst) item->y = y; item->id = id++; - item->cx = 80; + item->cx = 100; item->cy = 15; item->style = WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX;