Skip to content

Commit eabefe6

Browse files
FooterManDevFooterManDev
committed
Cleanup
1 parent 2bbe088 commit eabefe6

File tree

18 files changed

+127
-99
lines changed

18 files changed

+127
-99
lines changed

‎src/main/kotlin/io/github/footermandev/tritium/core/project/ModpackProject.kt‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import io.github.footermandev.tritium.ui.theme.TIcons
2222
import io.github.footermandev.tritium.ui.theme.qt.setStyle
2323
import io.github.footermandev.tritium.ui.theme.setInvalid
2424
import io.github.footermandev.tritium.ui.widgets.*
25+
import io.github.footermandev.tritium.ui.widgets.constructor_functions.hBoxLayout
26+
import io.github.footermandev.tritium.ui.widgets.constructor_functions.label
2527
import io.qt.core.Qt
2628
import io.qt.gui.QIcon
2729
import io.qt.gui.QPixmap
@@ -59,7 +61,7 @@ class ModpackProjectType : ProjectType {
5961
}
6062

6163
// MARK: Set the project Name
62-
val nameLabel = QLabel("Name:")
64+
val nameLabel = label("Name:")
6365
val nameField = QLineEdit().apply {
6466
text = initialVars.getOrDefault("packName", "")
6567
textChanged.connect { initialVars["packName"] = this.text }
@@ -78,7 +80,7 @@ class ModpackProjectType : ProjectType {
7880
form.addRow(nameLabel, nameField)
7981

8082
// MARK: Set the project location
81-
val pathLabel = QLabel("Location:")
83+
val pathLabel = label("Location:")
8284
val pathField = InfoLineEditWidget().apply {
8385
val slash = if(Platform.isWindows) "\\" else "/"
8486
text = initialVars.getOrDefault("packPath", "~${slash}tritium${slash}${TConstants.Dirs.PROJECTS}")
@@ -100,7 +102,7 @@ class ModpackProjectType : ProjectType {
100102

101103
// MARK: Set the project Icon
102104
val iconPreview = QLabel()
103-
val iconLabel = QLabel("Icon:")
105+
val iconLabel = label("Icon:")
104106

105107
val iconPathField = QLineEdit().apply {
106108
text = initialVars.getOrDefault("iconPath", "")
@@ -147,7 +149,7 @@ class ModpackProjectType : ProjectType {
147149
}
148150

149151
val iconRow = QWidget()
150-
val iconRowLayout = QHBoxLayout(iconRow).apply {
152+
val iconRowLayout = hBoxLayout(iconRow) {
151153
contentsMargins = 0.m
152154
setSpacing(8)
153155
addWidget(iconPathField)
@@ -159,32 +161,32 @@ class ModpackProjectType : ProjectType {
159161
form.addRow(iconLabel, iconRow)
160162

161163
// MARK: Set the Minecraft Version
162-
val mcLabel = QLabel("Minecraft Version:")
163-
val mcCombo = TComboBox().apply {
164+
val mcLabel = label("Minecraft Version:")
165+
val mcCombo = TComboBox {
164166
sizeAdjustPolicy = QComboBox.SizeAdjustPolicy.AdjustToContents
165167
minimumWidth = 50
166168
}
167169
form.addRow(mcLabel, mcCombo)
168170

169171
// MARK: Set the Mod Loader
170-
val modLoaderLabel = QLabel("Mod Loader:")
171-
val modLoaderCombo = TComboBox().apply {
172+
val modLoaderLabel = label("Mod Loader:")
173+
val modLoaderCombo = TComboBox {
172174
sizeAdjustPolicy = QComboBox.SizeAdjustPolicy.AdjustToContents
173175
minimumWidth = 50
174176
}
175177
form.addRow(modLoaderLabel, modLoaderCombo)
176178

177179
// MARK: Set the Mod Loader Version
178-
val modLoaderVerLabel = QLabel("Mod Loader Version:")
179-
val modLoaderVerCombo = TComboBox().apply {
180+
val modLoaderVerLabel = label("Mod Loader Version:")
181+
val modLoaderVerCombo = TComboBox {
180182
sizeAdjustPolicy = QComboBox.SizeAdjustPolicy.AdjustToContents
181183
minimumWidth = 50
182184
}
183185
form.addRow(modLoaderVerLabel, modLoaderVerCombo)
184186

185187
// MARK: Set the Mod Source
186-
val sourceLabel = QLabel("Mod Source:")
187-
val sourceCombo = TComboBox().apply {
188+
val sourceLabel = label("Mod Source:")
189+
val sourceCombo = TComboBox {
188190
sizeAdjustPolicy = QComboBox.SizeAdjustPolicy.AdjustToContents
189191
minimumWidth = 50
190192
}
@@ -199,7 +201,7 @@ class ModpackProjectType : ProjectType {
199201
form.addRow(separatorLabel)
200202

201203
// MARK: Set if Git Repository should be initialized
202-
val gitLabel = QLabel("Create Git Repository:")
204+
val gitLabel = label("Create Git Repository:")
203205
val gitCheckbox = QCheckBox().apply {
204206
isCheckable = Git.gitExecExists
205207
isChecked = initialVars.getOrDefault("initGit", "false") == "true"
@@ -212,22 +214,22 @@ class ModpackProjectType : ProjectType {
212214
form.addRow(gitLabel, gitCheckbox)
213215

214216
// MARK: Set License
215-
val licenseLabel = QLabel("License:")
216-
val licenseCombo = TComboBox().apply {
217+
val licenseLabel = label("License:")
218+
val licenseCombo = TComboBox {
217219
sizeAdjustPolicy = QComboBox.SizeAdjustPolicy.AdjustToContents
218220
minimumWidth = 50
219221
}
220222
form.addRow(licenseLabel, licenseCombo)
221223

222-
val licenseAuthorLabel = QLabel("License Author:").apply { visible = false }
224+
val licenseAuthorLabel = label("License Author:") { visible = false }
223225
val licenseAuthorField = QLineEdit().apply {
224226
visible = false
225227
textChanged.connect { initialVars["licenseAuthor"] = text }
226228
}
227-
val licenseAuthorSource = QLabel().apply { visible = false }
229+
val licenseAuthorSource = label() { visible = false }
228230

229231
val licenseAuthorRow = QWidget()
230-
val licenseAuthorRowLayout = QHBoxLayout(licenseAuthorRow).apply {
232+
val licenseAuthorRowLayout = hBoxLayout(licenseAuthorRow) {
231233
contentsMargins = 0.m
232234
setSpacing(8)
233235
addWidget(licenseAuthorField)

‎src/main/kotlin/io/github/footermandev/tritium/extension/core/CoreSettings.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import io.github.footermandev.tritium.settings.SettingWidgetContext
66
import io.github.footermandev.tritium.settings.settingsDefinition
77
import io.github.footermandev.tritium.ui.widgets.InfoLineEditWidget
88
import io.github.footermandev.tritium.ui.widgets.constructor_functions.hBoxLayout
9+
import io.github.footermandev.tritium.ui.widgets.constructor_functions.label
910
import io.qt.core.Qt
10-
import io.qt.widgets.QLabel
1111
import io.qt.widgets.QWidget
1212
import kotlinx.serialization.builtins.serializer
1313

@@ -44,7 +44,7 @@ private class WindowSizeWidget(
4444
objectName = "settingsInput"
4545
minimumWidth = 72
4646
}
47-
private val separator = QLabel("X").apply {
47+
private val separator = label("X") {
4848
setAlignment(Qt.AlignmentFlag.AlignCenter)
4949
minimumWidth = 12
5050
}
@@ -56,7 +56,7 @@ private class WindowSizeWidget(
5656
private var isRefreshing = false
5757

5858
init {
59-
val layout = hBoxLayout(this).apply {
59+
val layout = hBoxLayout(this) {
6060
setContentsMargins(0, 0, 0, 0)
6161
widgetSpacing = 6
6262
setAlignment(Qt.AlignmentFlag.AlignVCenter)

‎src/main/kotlin/io/github/footermandev/tritium/extension/core/JavaRuntimeSettingWidget.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private class JavaRuntimeAutoDetectDialog(
123123
selectCurrentRow()
124124
}
125125

126-
vBoxLayout(this).apply {
126+
vBoxLayout(this) {
127127
contentsMargins = 10.m
128128
widgetSpacing = 8
129129
addWidget(hintLabel)

‎src/main/kotlin/io/github/footermandev/tritium/git/github/GitHubAuth.kt‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import io.github.footermandev.tritium.platform.ClientIdentity
99
import io.github.footermandev.tritium.platform.Platform.Companion.openBrowser
1010
import io.github.footermandev.tritium.ui.helpers.runOnGuiThread
1111
import io.github.footermandev.tritium.ui.widgets.BrowseLabel
12+
import io.github.footermandev.tritium.ui.widgets.TPushButton
13+
import io.github.footermandev.tritium.ui.widgets.constructor_functions.hBoxLayout
14+
import io.github.footermandev.tritium.ui.widgets.constructor_functions.label
15+
import io.github.footermandev.tritium.ui.widgets.constructor_functions.vBoxLayout
1216
import io.ktor.client.*
1317
import io.ktor.client.call.*
1418
import io.ktor.client.engine.cio.*
@@ -21,7 +25,9 @@ import io.ktor.http.*
2125
import io.ktor.serialization.kotlinx.json.*
2226
import io.qt.core.QTimer
2327
import io.qt.core.Qt
24-
import io.qt.widgets.*
28+
import io.qt.widgets.QApplication
29+
import io.qt.widgets.QDialog
30+
import io.qt.widgets.QWidget
2531
import kotlinx.coroutines.*
2632
import kotlinx.serialization.SerialName
2733
import kotlinx.serialization.Serializable
@@ -278,26 +284,26 @@ internal class GHDeviceFlowAuth(
278284
minimumWidth = 480
279285
}
280286

281-
val layout = QVBoxLayout(dialog)
282-
val info = QLabel("Open the URL below and enter the code to sign in to GitHub:")
287+
val layout = vBoxLayout(dialog)
288+
val info = label("Open the URL below and enter the code to sign in to GitHub:")
283289
info.wordWrap = true
284290
layout.addWidget(info)
285291

286292
val urlLabel = BrowseLabel("<i>Waiting for verification URL...</i>")
287293
layout.addWidget(urlLabel)
288294

289-
val codeLabel = QLabel("<b style='font-size:18px;'>...</b>").apply {
295+
val codeLabel = label("<b style='font-size:18px;'>...</b>").apply {
290296
alignment = Qt.AlignmentFlag.AlignCenter.asAlignment()
291297
}
292298
layout.addWidget(codeLabel)
293299

294-
val hintLabel = QLabel("Waiting for code...")
300+
val hintLabel = label("Waiting for code...")
295301
layout.addWidget(hintLabel)
296302

297303
val btnRow = QWidget()
298-
val btnLayout = QHBoxLayout(btnRow)
299-
val openBtn = QPushButton("Open in browser")
300-
val cancelBtn = QPushButton("Cancel")
304+
val btnLayout = hBoxLayout(btnRow)
305+
val openBtn = TPushButton { text = "Open in browser" }
306+
val cancelBtn = TPushButton { text = "Cancel" }
301307
btnLayout.addStretch(1)
302308
btnLayout.addWidget(openBtn)
303309
btnLayout.addWidget(cancelBtn)

‎src/main/kotlin/io/github/footermandev/tritium/ui/dashboard/BuiltinProjectListStyles.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ private class GridStyle(private val ctx: ProjectStyleContext) : ProjectListStyle
234234

235235
sortedGroupNames.forEach { groupName ->
236236
val section = qWidget()
237-
val sectionLayout = vBoxLayout(section).apply { contentsMargins = QMargins(8, 0, 0, 6); widgetSpacing = 6 }
237+
val sectionLayout = vBoxLayout(section) { contentsMargins = QMargins(8, 0, 0, 6); widgetSpacing = 6 }
238238

239239
val header = GroupHeaderLabel(groupName, ctx).apply {
240240
text = if (groupName == "Ungrouped") "Ungrouped" else groupName
@@ -699,7 +699,7 @@ private class ProjectTile(
699699
setFixedWidth(GRID_TILE_WIDTH)
700700
minimumSize = qs(GRID_TILE_WIDTH, 0)
701701

702-
val layout = vBoxLayout(this).apply { contentsMargins = 8.m; widgetSpacing = 6; setAlignment(Qt.AlignmentFlag.AlignTop) }
702+
val layout = vBoxLayout(this) { contentsMargins = 8.m; widgetSpacing = 6; setAlignment(Qt.AlignmentFlag.AlignTop) }
703703

704704
val iconLabel = label {
705705
val iconSize = qs(GRID_ICON_SIZE, GRID_ICON_SIZE)
@@ -955,7 +955,7 @@ private class DraggableTile(
955955
setFixedWidth(GRID_TILE_WIDTH)
956956
cursor = defaultCursor()
957957

958-
val layout = vBoxLayout(this).apply { contentsMargins = 8.m; widgetSpacing = 6; setAlignment(Qt.AlignmentFlag.AlignTop) }
958+
val layout = vBoxLayout(this) { contentsMargins = 8.m; widgetSpacing = 6; setAlignment(Qt.AlignmentFlag.AlignTop) }
959959
val iconLabel = label {
960960
val iconSize = qs(GRID_ICON_SIZE, GRID_ICON_SIZE)
961961
minimumSize = iconSize

‎src/main/kotlin/io/github/footermandev/tritium/ui/dashboard/Dashboard.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class Dashboard internal constructor() : QMainWindow() {
5555
objectName = "dashboard"
5656
}
5757

58-
val mainLayout = hBoxLayout(central).apply {
58+
val mainLayout = hBoxLayout(central) {
5959
setSpacing(0)
6060
setContentsMargins(0, 0, 0, 0)
6161
}

‎src/main/kotlin/io/github/footermandev/tritium/ui/dashboard/ProjectsPanel.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import io.github.footermandev.tritium.ui.dashboard.Dashboard.Companion.bgDashboa
1111
import io.github.footermandev.tritium.ui.theme.TColors
1212
import io.github.footermandev.tritium.ui.theme.TIcons
1313
import io.github.footermandev.tritium.ui.theme.qt.setThemedStyle
14+
import io.github.footermandev.tritium.ui.widgets.TComboBox
1415
import io.github.footermandev.tritium.ui.widgets.TPushButton
1516
import io.github.footermandev.tritium.ui.widgets.constructor_functions.hBoxLayout
1617
import io.github.footermandev.tritium.ui.widgets.constructor_functions.label
@@ -83,8 +84,8 @@ class ProjectsPanel internal constructor(): QWidget(), ProjectMngrListener {
8384
private var searchFilter: String = ""
8485

8586
private val styleButtons = QButtonGroup(this)
86-
private val styleButtonRow = QHBoxLayout()
87-
private val sortCombo = QComboBox()
87+
private val styleButtonRow = hBoxLayout()
88+
private val sortCombo = TComboBox()
8889
private val styleStackHost = qWidget()
8990
private val styleStack = QStackedLayout().also { styleStackHost.setLayout(it) }
9091
private var styleControls: QWidget
@@ -217,7 +218,7 @@ class ProjectsPanel internal constructor(): QWidget(), ProjectMngrListener {
217218
startDir,
218219
"Tritium Project (trproj.json);;JSON Files (*.json);;All Files (*)"
219220
)
220-
val selectedPath = chosen.result.trim()
221+
val selectedPath = chosen?.result?.trim().orEmpty()
221222
if (selectedPath.isBlank()) return
222223

223224
importProjectFromSelection(VPath.get(selectedPath))

‎src/main/kotlin/io/github/footermandev/tritium/ui/dashboard/ThemesPanel.kt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ import io.github.footermandev.tritium.ui.theme.ThemeType
1010
import io.github.footermandev.tritium.ui.theme.qt.setThemedStyle
1111
import io.github.footermandev.tritium.ui.widgets.TComboBox
1212
import io.github.footermandev.tritium.ui.widgets.TPushButton
13+
import io.github.footermandev.tritium.ui.widgets.constructor_functions.hBoxLayout
14+
import io.github.footermandev.tritium.ui.widgets.constructor_functions.label
15+
import io.github.footermandev.tritium.ui.widgets.constructor_functions.vBoxLayout
1316
import io.qt.core.QModelIndex
1417
import io.qt.core.QSignalBlocker
1518
import io.qt.core.QUrl
@@ -91,25 +94,25 @@ class ThemesPanel internal constructor(): QWidget() {
9194

9295
private fun createThemeSection(): QGroupBox {
9396
val group = QGroupBox("Themes")
94-
val layout = QVBoxLayout(group).apply {
97+
val layout = vBoxLayout(group) {
9598
contentsMargins = 12.m
9699
widgetSpacing = 12
97100
}
98101

99102
val comboRow = QWidget()
100-
val comboLayout = QHBoxLayout(comboRow).apply {
103+
val comboLayout = hBoxLayout(comboRow) {
101104
contentsMargins = 0.m
102105
widgetSpacing = 8
103106
}
104107

105-
val label = QLabel("Theme:").apply { minimumWidth = 80 }
108+
val label = label("Theme:") { minimumWidth = 80 }
106109

107110
comboLayout.addWidget(label)
108111
comboLayout.addWidget(themeComboBox, 1)
109112
layout.addWidget(comboRow)
110113

111114
val btnRow = QWidget()
112-
val btnLayout = QHBoxLayout(btnRow)
115+
val btnLayout = hBoxLayout(btnRow)
113116
btnLayout.contentsMargins = 0.m
114117
btnLayout.widgetSpacing = 8
115118
btnLayout.addWidget(openFolderBtn)
@@ -122,34 +125,34 @@ class ThemesPanel internal constructor(): QWidget() {
122125

123126
private fun createFontSection(): QGroupBox {
124127
val group = QGroupBox("Fonts")
125-
val layout = QVBoxLayout(group).apply {
128+
val layout = vBoxLayout(group) {
126129
contentsMargins = 12.m
127130
widgetSpacing = 12
128131
}
129132

130133
val fontsRow = QWidget()
131-
val fontsLayout = QHBoxLayout(fontsRow).apply {
134+
val fontsLayout = hBoxLayout(fontsRow) {
132135
contentsMargins = 0.m
133136
widgetSpacing = 8
134137
}
135138

136-
val fontsLabel = QLabel("Global Font:").apply { minimumWidth = 80 }
139+
val fontsLabel = label("Global Font:") { minimumWidth = 80 }
137140
fontsLayout.addWidget(fontsLabel)
138141
fontsLayout.addWidget(globalFontComboBox, 1)
139-
fontsLayout.addWidget(QLabel("Size:"))
142+
fontsLayout.addWidget(label("Size:"))
140143
fontsLayout.addWidget(globalFontSizeSpinner)
141144
layout.addWidget(fontsRow)
142145

143146
val editorRow = QWidget()
144-
val editorLayout = QHBoxLayout(editorRow).apply {
147+
val editorLayout = hBoxLayout(editorRow) {
145148
contentsMargins = 0.m
146149
widgetSpacing = 8
147150
}
148151

149-
val editorLabel = QLabel("Editor Font:").apply { minimumWidth = 80 }
152+
val editorLabel = label("Editor Font:") { minimumWidth = 80 }
150153
editorLayout.addWidget(editorLabel)
151154
editorLayout.addWidget(editorFontComboBox, 1)
152-
editorLayout.addWidget(QLabel("Size:"))
155+
editorLayout.addWidget(label("Size:"))
153156
editorLayout.addWidget(editorFontSizeSpinner)
154157
layout.addWidget(editorRow)
155158

‎src/main/kotlin/io/github/footermandev/tritium/ui/project/menu/ProjectMenuBar.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import io.qt.widgets.*
2121
class ProjectMenuBar : QWidget() {
2222
private val logger = logger()
2323

24-
private val layout = hBoxLayout(this).apply {
24+
private val layout = hBoxLayout(this) {
2525
widgetSpacing = 6
2626
setContentsMargins(6, 2, 6, 2)
2727
}

0 commit comments

Comments
 (0)