Skip to content

Commit 85d5ecd

Browse files
committed
Upgrade to FlatLaf 3.7 + make use of native file chooser
1 parent 2c58386 commit 85d5ecd

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ dependencies {
2222
implementation("com.fazecast:jSerialComm:[2.0.0,3.0.0)")
2323
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
2424
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2")
25-
implementation("com.formdev:flatlaf:3.6")
26-
implementation("com.formdev:flatlaf-extras:3.6")
25+
implementation("com.formdev:flatlaf:3.7")
26+
implementation("com.formdev:flatlaf-extras:3.7")
2727
implementation("com.fifesoft:rsyntaxtextarea:3.5.2")
2828

2929
// Needed for AssemblyScript source mapping:

src/main/kotlin/be/ugent/topl/mio/ui/StartScreen.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ package be.ugent.topl.mio.ui
33
import be.ugent.topl.mio.DebuggerConfig
44
import be.ugent.topl.mio.connections.ProcessConnection
55
import be.ugent.topl.mio.connections.SerialConnection
6+
import be.ugent.topl.mio.sourcemap.AsSourceMapping
67
import com.fazecast.jSerialComm.SerialPort
78
import com.formdev.flatlaf.extras.FlatSVGIcon
8-
import be.ugent.topl.mio.sourcemap.AsSourceMapping
9+
import com.formdev.flatlaf.util.SystemFileChooser
910
import java.awt.Dimension
1011
import java.io.File
1112
import java.io.FileInputStream
1213
import java.io.FileWriter
13-
import java.util.Properties
14+
import java.util.*
1415
import javax.swing.*
15-
import javax.swing.filechooser.FileNameExtensionFilter
1616

1717
open class StartScreen(config: DebuggerConfig) : AboutScreen(config) {
1818
init {
@@ -53,12 +53,13 @@ open class StartScreen(config: DebuggerConfig) : AboutScreen(config) {
5353
if (File(recentConfig).exists()) {
5454
recentProperties.load(FileInputStream(recentConfig))
5555
}
56+
val chooser = SystemFileChooser(recentProperties.getOrDefault("lastDir", "").toString()).apply {
57+
fileSelectionMode = JFileChooser.FILES_ONLY
58+
fileFilter = SystemFileChooser.FileNameExtensionFilter("WebAssembly binaries (.wasm)", "wasm")
59+
}
5660
mainPanel.add(JButton("Select program").apply {
5761
setAlignmentX(CENTER_ALIGNMENT)
5862
addActionListener {
59-
val chooser = JFileChooser(recentProperties.getOrDefault("lastDir", "").toString())
60-
chooser.fileSelectionMode = JFileChooser.FILES_ONLY
61-
chooser.fileFilter = FileNameExtensionFilter("WebAssembly binaries (.wasm)", "wasm")
6263
if (chooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
6364
recentProperties.setProperty("lastDir", chooser.selectedFile.parent)
6465
recentProperties.store(FileWriter(recentConfig), null)

0 commit comments

Comments
 (0)