From 4e84abdd2849b2da8238e8470e47210600166560 Mon Sep 17 00:00:00 2001
From: Daan Selen <dselen@nerthus.nl>
Date: Fri, 21 Nov 2025 22:04:52 +0100
Subject: [PATCH] chore: code cleanup and changes

---
 .gitignore |  2 ++
 main.go    | 30 ++++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d650c66
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+fyne-cross
+Icon.png
\ No newline at end of file
diff --git a/main.go b/main.go
index c7d5809..79af33c 100644
--- a/main.go
+++ b/main.go
@@ -16,10 +16,14 @@ import (
 	"fyne.io/fyne/v2/widget"
 )
 
+var (
+	windowSize fyne.Size = fyne.NewSize(600, 500)
+)
+
 func main() {
-	a := app.NewWithID("nl.systemec.pfxgen")
+	a := app.NewWithID("nl.systemec.pkcs12-generator")
 	w := a.NewWindow("Systemec PKCS12-Generator")
-	w.Resize(fyne.NewSize(600, 400))
+	w.Resize(windowSize)
 
 	var keyPath, certPath string
 
@@ -30,23 +34,33 @@ func main() {
 	radioLabel1 := widget.NewLabel("Select which Sectigo Intermediate")
 
 	// Certificate Keyfile
-	btn1 := widget.NewButton("Upload Private Key File", func() {
-		dialog.ShowFileOpen(func(r fyne.URIReadCloser, err error) {
+	keyBtn := widget.NewButton("Upload Private Key File", func() {
+		keyDiag := dialog.NewFileOpen(func(r fyne.URIReadCloser, err error) {
 			if r != nil {
 				fileLabel1.SetText(r.URI().Name())
 				keyPath = r.URI().Path()
+				r.Close()
 			}
 		}, w)
+		// Optionally set filters, title, etc.
+		// certDiag.SetFilter(...)
+		keyDiag.Resize(windowSize)
+		keyDiag.Show()
 	})
 
 	// Certificate file
-	btn2 := widget.NewButton("Upload Certificate File", func() {
-		dialog.ShowFileOpen(func(r fyne.URIReadCloser, err error) {
+	certBtn := widget.NewButton("Upload Certificate File", func() {
+		// Use NewFileOpen to get the dialog object
+		certDiag := dialog.NewFileOpen(func(r fyne.URIReadCloser, err error) {
 			if r != nil {
 				fileLabel2.SetText(r.URI().Name())
 				certPath = r.URI().Path()
+				r.Close()
 			}
 		}, w)
+		// Resize the dialog
+		certDiag.Resize(windowSize)
+		certDiag.Show()
 	})
 
 	// Certificate Intermediate
@@ -105,8 +119,8 @@ func main() {
 
 	centerContent := container.NewVBox(
 		widget.NewLabel("Select relevant files."),
-		container.New(layout.NewGridLayout(2), btn1, fileLabel1),
-		container.New(layout.NewGridLayout(2), btn2, fileLabel2),
+		container.New(layout.NewGridLayout(2), keyBtn, fileLabel1),
+		container.New(layout.NewGridLayout(2), certBtn, fileLabel2),
 		layout.NewSpacer(),
 		container.New(layout.NewGridLayout(2), radioLabel1, caRadio),
 		layout.NewSpacer(), // optional flexible space