feat: Port audiotracks and subtitles to Blueprint, port to Adw.Window instead of Gtk.Dialog everywhere

Signed-off-by: Felicitas Pojtinger <[email protected]>

Author: pojntfx

.gitignore

@@ -4,7 +4,5 @@ vendor
 *.compiled
 *.gresource
 *.ui
-!audiotracks.ui
-!subtitles.ui
 !error.ui
 !warning.ui

internal/components/controls.go

@@ -179,7 +179,7 @@ func OpenControlsWindow(
 	descriptionProgressBar := descriptionBuilder.GetObject("preparing-progress-bar").Cast().(*gtk.ProgressBar)
 
 	subtitlesBuilder := gtk.NewBuilderFromResource(resources.GResourceSubtitlesPath)
-	subtitlesDialog := subtitlesBuilder.GetObject("subtitles-dialog").Cast().(*gtk.Dialog)
+	subtitlesDialog := subtitlesBuilder.GetObject("subtitles-dialog").Cast().(*adw.Window)
 	subtitlesCancelButton := subtitlesBuilder.GetObject("button-cancel").Cast().(*gtk.Button)
 	subtitlesSpinner := subtitlesBuilder.GetObject("headerbar-spinner").Cast().(*gtk.Spinner)
 	subtitlesOKButton := subtitlesBuilder.GetObject("button-ok").Cast().(*gtk.Button)
@@ -188,7 +188,7 @@ func OpenControlsWindow(
 	subtitlesOverlay := subtitlesBuilder.GetObject("toast-overlay").Cast().(*adw.ToastOverlay)
 
 	audiotracksBuilder := gtk.NewBuilderFromResource(resources.GResourceAudiotracksPath)
-	audiotracksDialog := audiotracksBuilder.GetObject("audiotracks-dialog").Cast().(*gtk.Dialog)
+	audiotracksDialog := audiotracksBuilder.GetObject("audiotracks-dialog").Cast().(*adw.Window)
 	audiotracksCancelButton := audiotracksBuilder.GetObject("button-cancel").Cast().(*gtk.Button)
 	audiotracksOKButton := audiotracksBuilder.GetObject("button-ok").Cast().(*gtk.Button)
 	audiotracksSelectionGroup := audiotracksBuilder.GetObject("audiotracks").Cast().(*adw.PreferencesGroup)
@@ -1418,27 +1418,20 @@ func OpenControlsWindow(
 			})
 
 			subtitleButton.ConnectClicked(func() {
-				subtitlesDialog.SetVisible(true)
+				subtitlesDialog.Present()
 			})
 
 			audiotracksButton.ConnectClicked(func() {
-				audiotracksDialog.SetVisible(true)
+				audiotracksDialog.Present()
 			})
 
-			for _, d := range []*gtk.Dialog{subtitlesDialog, audiotracksDialog} {
+			for _, d := range []*adw.Window{subtitlesDialog, audiotracksDialog} {
 				dialog := d
 
 				escCtrl := gtk.NewEventControllerKey()
 				dialog.AddController(escCtrl)
 				dialog.SetTransientFor(&window.Window)
 
-				dialog.ConnectCloseRequest(func() (ok bool) {
-					dialog.Close()
-					dialog.SetVisible(false)
-
-					return ok
-				})
-
 				escCtrl.ConnectKeyReleased(func(keyval, keycode uint, state gdk.ModifierType) {
 					if keycode == keycodeEscape {
 						dialog.Close()
@@ -1469,14 +1462,22 @@ func OpenControlsWindow(
 
 			subtitlesOKButton.ConnectClicked(func() {
 				subtitlesDialog.Close()
+				subtitlesDialog.SetVisible(false)
+			})
+
+			audiotracksCancelButton.ConnectClicked(func() {
+				audiotracksDialog.Close()
+				subtitlesDialog.SetVisible(false)
 			})
 
 			audiotracksCancelButton.ConnectClicked(func() {
 				audiotracksDialog.Close()
+				subtitlesDialog.SetVisible(false)
 			})
 
 			audiotracksOKButton.ConnectClicked(func() {
 				audiotracksDialog.Close()
+				subtitlesDialog.SetVisible(false)
 			})
 
 			addSubtitlesFromFileButton.ConnectClicked(func() {

internal/resources/audiotracks.blp

@@ -0,0 +1,47 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.Window audiotracks-dialog {
+  modal: true;
+  title: 'Audio Tracks';
+  default-width: 500;
+  default-height: 500;
+
+  Adw.ToolbarView {
+    [top]
+    Adw.HeaderBar {
+      show-end-title-buttons: false;
+      show-start-title-buttons: false;
+
+      [start]
+      Button button-cancel {
+        label: 'Cancel';
+      }
+
+      [end]
+      Button button-ok {
+        label: 'OK';
+
+        styles [
+          "suggested-action",
+        ]
+      }
+    }
+
+    Adw.ToastOverlay toast-overlay {
+      ScrolledWindow {
+        Adw.Clamp {
+          maximum-size: 600;
+          vexpand: true;
+          valign: fill;
+          margin-top: 12;
+          margin-start: 12;
+          margin-end: 12;
+          margin-bottom: 12;
+
+          Adw.PreferencesGroup audiotracks {}
+        }
+      }
+    }
+  }
+}

internal/resources/resources.go

@@ -47,11 +47,15 @@ var GResourcePreferencesPath = path.Join(gResourceAppPath, "preferences.ui")
 //go:generate blueprint-compiler compile --output preparing.ui preparing.blp
 var GResourcePreparingPath = path.Join(gResourceAppPath, "preparing.ui")
 
-var GResourceErrorPath = path.Join(gResourceAppPath, "error.ui")
-var GResourceWarningPath = path.Join(gResourceAppPath, "warning.ui")
+//go:generate blueprint-compiler compile --output subtitles.ui subtitles.blp
 var GResourceSubtitlesPath = path.Join(gResourceAppPath, "subtitles.ui")
+
+//go:generate blueprint-compiler compile --output audiotracks.ui audiotracks.blp
 var GResourceAudiotracksPath = path.Join(gResourceAppPath, "audiotracks.ui")
 
+var GResourceErrorPath = path.Join(gResourceAppPath, "error.ui")
+var GResourceWarningPath = path.Join(gResourceAppPath, "warning.ui")
+
 var GResourceStyleCSSPath = path.Join(gResourceAppPath, "style.css")
 var GResourceMetainfoPath = path.Join(gResourceAppPath, "com.pojtinger.felicitas.Multiplex.metainfo.xml")
 

internal/resources/subtitles.blp

@@ -0,0 +1,92 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.Window subtitles-dialog {
+  modal: true;
+  title: 'Subtitles';
+  default-width: 500;
+  default-height: 500;
+
+  Adw.ToolbarView {
+    [top]
+    Adw.HeaderBar {
+      show-end-title-buttons: false;
+      show-start-title-buttons: false;
+
+      [start]
+      Button button-cancel {
+        label: 'Cancel';
+      }
+
+      [title]
+      Box {
+        orientation: horizontal;
+        spacing: 12;
+        valign: center;
+        halign: center;
+
+        Spinner headerbar-spinner {
+          tooltip-text: 'Getting metadata ...';
+          visible: false;
+        }
+
+        Label {
+          label: 'Subtitles';
+
+          styles [
+            "title",
+          ]
+        }
+      }
+
+      [end]
+      Button button-ok {
+        label: 'OK';
+
+        styles [
+          "suggested-action",
+        ]
+      }
+    }
+
+    Adw.ToastOverlay toast-overlay {
+      ScrolledWindow {
+        Adw.Clamp {
+          maximum-size: 600;
+          vexpand: true;
+          valign: fill;
+          margin-top: 12;
+          margin-start: 12;
+          margin-end: 12;
+          margin-bottom: 12;
+
+          Adw.PreferencesGroup subtitle-tracks {
+            title: _('Tracks');
+
+            [header-suffix]
+            Button add-from-file-button {
+              styles [
+                "flat",
+              ]
+
+              valign: center;
+
+              Box {
+                spacing: 6;
+
+                Image {
+                  icon-name: 'list-add-symbolic';
+                }
+
+                Label {
+                  label: 'Add from file';
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+