Make the OSARA Configuration dialog and its controls bigger so they aren't cut off visually. (#1106)

The width is now hard-coded to a larger value.
Since the build system auto calculates the y coordinates for this dialog, we now use that information to auto calculate the height of the dialog too.

Author: jcsteh

site_scons/makeConfigRc.py

@@ -11,14 +11,15 @@ def makeConfigRc(target, source, env):
 	resourceH = open(source[0].path, "rt", encoding="UTF-8")
 	for line in resourceH:
 		if line.startswith("#define ID_CONFIG_DLG "):
-			cid = int(line.strip().rsplit(" ")[-1])
+			cid = dialogCid = int(line.strip().rsplit(" ")[-1])
 			break
-	out.write(
-"""#include <windows.h>
-{cid} DIALOGEX 250, 125, 185, 212
-	CAPTION "OSARA Configuration"
-BEGIN
-""".format(cid=cid))
+	lines = []
+	lines.append("#include <windows.h>\n")
+	# We can't generate the DIALOGEX header yet because we don't know the height
+	# yet. Add a placeholder here and generate that below.
+	lines.append(None)
+	lines.append('\tCAPTION "OSARA Configuration"\n')
+	lines.append('BEGIN\n')
 	y = 6
 	settingsH = open(source[1].path, "rt", encoding="UTF-8")
 	setting = None
@@ -33,11 +34,14 @@ def makeConfigRc(target, source, env):
 			continue # Setting is split across multiple lines.
 		m = RE_BOOL_SETTING.match(setting)
 		cid += 1
-		out.write(
-			'\tCONTROL {displayName}, {cid}, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, {y}, 200, 14\n'
-			.format(displayName=m.group("displayName"), cid=cid, y=y))
+		displayName = m.group("displayName")
+		lines.append(
+			f'\tCONTROL {displayName}, {cid}, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, {y}, 390, 14\n')
 		y += 20
-	out.write('\tDEFPUSHBUTTON "OK", IDOK, 10, {y}, 30, 14\n'
-		'\tPUSHBUTTON "Cancel", IDCANCEL, 137, {y}, 40, 14\n'
-		.format(y=y))
-	out.write('END\n')
+	lines.append(f'\tDEFPUSHBUTTON "OK", IDOK, 10, {y}, 30, 14\n'
+		f'\tPUSHBUTTON "Cancel", IDCANCEL, 137, {y}, 40, 14\n')
+	y += 20
+	# We know the height now. Generate the DIALOGEX header.
+	lines[1] = f"{dialogCid} DIALOGEX 250, 125, 400, {y}\n"
+	lines.append('END\n')
+	out.writelines(lines)