diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index 768c5710..f2048cc4 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -699,103 +699,40 @@ class GeneratorOptions(QtWidgets.QWizardPage): modLayout = QtWidgets.QGridLayout() modLayout_row = 1 - modLayout.addWidget( - QtWidgets.QLabel("A-4E Skyhawk (version 2.0.0)"), modLayout_row, 0 - ) - modLayout.addWidget(a4_skyhawk, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("A-6A Intruder (v2.7.5.01)"), modLayout_row, 0 - ) - modLayout.addWidget(a6a_intruder, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("F-4B Phantom II (v2.7.10.02 EFM + Patch 2022.10.02)"), - modLayout_row, - 0, - ) - modLayout.addWidget(f4b_phantom, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget(QtWidgets.QLabel("F-15D Baz (v1.0)"), modLayout_row, 0) - modLayout.addWidget(f15d_baz, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("F-16I Sufa & F-16D (version 2.2 by IDF Mods Project)"), - modLayout_row, - 0, - ) - modLayout.addWidget(f_16_idf, modLayout_row, 1) - modLayout_row += 1 - # Section break here for readability - modLayout.addWidget(QtWidgets.QWidget(), modLayout_row, 0) - modLayout_row += 1 - modLayout.addWidget(QtWidgets.QLabel("F-22A Raptor"), modLayout_row, 0) - modLayout.addWidget(f22_raptor, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("F-84G Thunderjet (version 2.5.7.01)"), - modLayout_row, - 0, - ) - modLayout.addWidget(f84g_thunderjet, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("F-100 Super Sabre (version 2.7.18.30765 patch 09.10.22)"), - modLayout_row, - 0, - ) - modLayout.addWidget(f100_supersabre, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("F-104 Starfighter (version 2.7.11.222.01)"), - modLayout_row, - 0, - ) - modLayout.addWidget(f104_starfighter, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("F-105 Thunderchief (version 2.7.12.23x)"), - modLayout_row, - 0, - ) - modLayout.addWidget(f105_thunderchief, modLayout_row, 1) - modLayout_row += 1 - # Section break here for readability - modLayout.addWidget(QtWidgets.QWidget(), modLayout_row, 0) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("C-130J-30 Super Hercules"), modLayout_row, 0 - ) - modLayout.addWidget(hercules, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("UH-60L Black Hawk (version 1.3.1)"), modLayout_row, 0 - ) - modLayout.addWidget(uh_60l, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("JAS 39 Gripen (version v1.8.0-beta)"), modLayout_row, 0 - ) - modLayout.addWidget(jas39_gripen, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget( - QtWidgets.QLabel("Su-30 Flanker-H (V2.01B)"), modLayout_row, 0 - ) - modLayout.addWidget(su30_flanker_h, modLayout_row, 1) - modLayout_row += 1 - modLayout.addWidget(QtWidgets.QLabel("Su-57 Felon"), modLayout_row, 0) - modLayout.addWidget(su57_felon, modLayout_row, 1) - modLayout_row += 1 - # Section break here for readability - modLayout.addWidget(QtWidgets.QWidget(), modLayout_row, 0) - modLayout_row += 14 - modLayout.addWidget(QtWidgets.QLabel("Frenchpack"), modLayout_row, 0) - modLayout.addWidget(frenchpack, modLayout_row, 1) - # new column starts here - modLayout_row = 1 - modLayout.addWidget(QtWidgets.QLabel("High Digit SAMs"), modLayout_row, 2) - modLayout.addWidget(high_digit_sams, modLayout_row, 3) + mod_pairs = [ + ("A-4E Skyhawk (v2.0.0)", a4_skyhawk), + ("A-6A Intruder (v2.7.5.01)", a6a_intruder), + ("C-130J-30 Super Hercules", hercules), + ("F-4B Phantom II (v2.7.10.02 EFM + Patch 2022.10.02)", f4b_phantom), + ("F-15D Baz (v1.0)", f15d_baz), + ("F-16I Sufa & F-16D (v2.2 by IDF Mods Project)", f_16_idf), + ("F-22A Raptor", f22_raptor), + ("F-84G Thunderjet (v2.5.7.01)", f84g_thunderjet), + ("F-100 Super Sabre (v2.7.18.30765 patch 09.10.22)", f100_supersabre), + ("F-104 Starfighter (v2.7.11.222.01)", f104_starfighter), + ("F-105 Thunderchief (v2.7.12.23x)", f105_thunderchief), + ("Frenchpack", frenchpack), + ("High Digit SAMs", high_digit_sams), + ("JAS 39 Gripen (v1.8.0-beta)", jas39_gripen), + ("Su-30 Flanker-H (V2.01B)", su30_flanker_h), + ("Su-57 Felon", su57_felon), + ("UH-60L Black Hawk (v1.3.1)", uh_60l), + ] + + for i in range(len(mod_pairs)): + if i % 15 == 0: + modLayout_row = 1 + col = 2 * (i // 15) + if i % 5 == 0: + # Section break here for readability + modLayout.addWidget(QtWidgets.QWidget(), modLayout_row, col) + modLayout_row += 1 + label, cb = mod_pairs[i] + modLayout.addWidget(QLabel(label), modLayout_row, col) + modLayout.addWidget(cb, modLayout_row, col + 1) + modLayout_row += 1 + modSettingsGroup.setLayout(modLayout) mlayout = QVBoxLayout()