Merge pull request #2047 from jriwanek-forks/ui-changes

win32 UI changes

.github/workflows/cmake.yml

@@ -100,7 +100,7 @@ jobs:
       run: cmake --build build --target ${{ matrix.build.target }}
     - uses: actions/upload-artifact@v2
       with:
-        name: '86Box${{ matrix.build.slug }}-MSYS2-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
+        name: '86Box${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
         path: build/artifacts/**
 
   llvm-windows:

src/machine/machine_table.c

@@ -178,7 +178,7 @@ const machine_t machines[] = {
     /* Uses Compaq KBC firmware. */
     { "[ISA] Compaq Portable III",		"portableiii",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_VIDEO,							  640, 16384, 128,  127,	  machine_at_portableiii_init, at_cpqiii_get_device	},
     /* Has IBM AT KBC firmware. */
-    { "[ISA] MR 286 clone",			"mr286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE,							  512, 16384, 128,  127,		machine_at_mr286_init, NULL			},
+    { "[ISA] MR BIOS 286 clone",			"mr286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE,							  512, 16384, 128,  127,		machine_at_mr286_init, NULL			},
     /* Has IBM AT KBC firmware. */
     { "[ISA] NCR PC8/810/710/3390/3392",	"pc8",			MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512, 16384, 128,  127,		  machine_at_pc8_init, NULL			},
 #if defined(DEV_BRANCH) && defined(USE_OLIVETTI)
@@ -246,7 +246,7 @@ const machine_t machines[] = {
     { "[ALi M1217] Flytech 386",		"flytech386",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			 1024, 16384, 1024, 127,	   machine_at_flytech386_init, at_flytech386_get_device	},
     /* I'm going to assume this has a standard/generic IBM-compatible AT KBC
        firmware until the board is identified. */
-    { "[ALi M1217] MR 386SX clone",		"mr1217",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			 1024, 16384, 1024, 127,	       machine_at_mr1217_init, NULL			},
+    { "[ALi M1217] MR BIOS 386SX clone",		"mr1217",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			 1024, 16384, 1024, 127,	       machine_at_mr1217_init, NULL			},
     /* Has IBM PS/2 Type 1 KBC firmware. */
     { "[ALi M6117] Acrosser PJ-A511M",		"pja511m",		MACHINE_TYPE_386SX,		CPU_PKG_M6117, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE,					 1024, 32768, 1024, 127,	      machine_at_pja511m_init, NULL			},
     /* Has IBM PS/2 Type 1 KBC firmware. */

src/win/86Box.rc

@@ -227,7 +227,7 @@ BEGIN
     DLG_CFG_MACHINE, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 260
+        RIGHTMARGIN, 300
         TOPMARGIN, 7
 #ifdef USE_DYNAREC
         BOTTOMMARGIN, 87
@@ -239,7 +239,7 @@ BEGIN
     DLG_CFG_VIDEO, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 260
+        RIGHTMARGIN, 300
         TOPMARGIN, 7
         BOTTOMMARGIN, 38
     END
@@ -247,7 +247,7 @@ BEGIN
     DLG_CFG_INPUT, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 260
+        RIGHTMARGIN, 300
         TOPMARGIN, 7
         BOTTOMMARGIN, 58
     END
@@ -255,7 +255,7 @@ BEGIN
     DLG_CFG_SOUND, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 260
+        RIGHTMARGIN, 300
         TOPMARGIN, 7
         BOTTOMMARGIN, 109
     END
@@ -263,7 +263,7 @@ BEGIN
     DLG_CFG_NETWORK, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 260
+        RIGHTMARGIN, 300
         TOPMARGIN, 7
         BOTTOMMARGIN, 56
     END
@@ -271,7 +271,7 @@ BEGIN
     DLG_CFG_PORTS, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 260
+        RIGHTMARGIN, 300
         TOPMARGIN, 7
         BOTTOMMARGIN, 48
     END
@@ -279,7 +279,7 @@ BEGIN
     DLG_CFG_PERIPHERALS, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 260
+        RIGHTMARGIN, 300
         TOPMARGIN, 7
         BOTTOMMARGIN, 85
     END
@@ -287,7 +287,7 @@ BEGIN
     DLG_CFG_HARD_DISKS, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 260
+        RIGHTMARGIN, 300
         TOPMARGIN, 7
         BOTTOMMARGIN, 137
     END
@@ -295,7 +295,7 @@ BEGIN
     DLG_CFG_FLOPPY_DRIVES, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 260
+        RIGHTMARGIN, 300
         TOPMARGIN, 7
         BOTTOMMARGIN, 96
     END
@@ -303,7 +303,7 @@ BEGIN
     DLG_CFG_OTHER_REMOVABLE_DEVICES, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 260
+        RIGHTMARGIN, 300
         TOPMARGIN, 7
         BOTTOMMARGIN, 214
     END