refactor: Port warning dialog to AdwAlertDialog

Signed-off-by: Felicitas Pojtinger <felicitas@pojtinger.com>

Author: pojntfx

.gitignore

@@ -7,3 +7,4 @@ vendor
 !audiotracks.ui
 !subtitles.ui
 !error.ui
+!warning.ui

internal/components/assistant.go

@@ -45,6 +45,10 @@ const (
 	applyPreferencesActionName = "applypreferences"
 	openDownloadsActionName    = "opendownloads"
 	copyMagnetLinkActionName   = "copymagnetlink"
+
+	responseDownloadFlathub     = "download-flathub"
+	responseDownloadWebsite     = "download-website"
+	responseManualConfiguration = "manual-configuration"
 )
 
 func OpenAssistantWindow(
@@ -89,10 +93,7 @@ func OpenAssistantWindow(
 	descriptionHeaderbarSubtitle := descriptionBuilder.GetObject("headerbar-subtitle").Cast().(*gtk.Label)
 
 	warningBuilder := gtk.NewBuilderFromResource(resources.GResourceWarningPath)
-	warningDialog := warningBuilder.GetObject("warning-dialog").Cast().(*gtk.MessageDialog)
-	mpvFlathubDownloadButton := warningBuilder.GetObject("mpv-download-flathub-button").Cast().(*gtk.Button)
-	mpvWebsiteDownloadButton := warningBuilder.GetObject("mpv-download-website-button").Cast().(*gtk.Button)
-	mpvManualConfigurationButton := warningBuilder.GetObject("mpv-manual-configuration-button").Cast().(*gtk.Button)
+	warningDialog := warningBuilder.GetObject("warning-dialog").Cast().(*adw.AlertDialog)
 
 	magnetLink := ""
 	torrentTitle := ""
@@ -721,41 +722,32 @@ func OpenAssistantWindow(
 	})
 
 	if runtime.GOOS == "linux" {
-		mpvFlathubDownloadButton.SetVisible(true)
-		warningDialog.SetDefaultWidget(mpvFlathubDownloadButton)
-	} else {
-		warningDialog.SetDefaultWidget(mpvWebsiteDownloadButton)
+		warningDialog.SetResponseEnabled(responseDownloadFlathub, true)
+		warningDialog.SetDefaultResponse(responseDownloadFlathub)
 	}
 
-	mpvFlathubDownloadButton.ConnectClicked(func() {
-		_ = openuri.OpenURI("", mpvFlathubURL, nil)
-
-		warningDialog.Close()
-
-		os.Exit(0)
-	})
+	warningDialog.ConnectResponse(func(response string) {
+		switch response {
+		case responseDownloadFlathub:
+			_ = openuri.OpenURI("", mpvFlathubURL, nil)
 
-	mpvWebsiteDownloadButton.ConnectClicked(func() {
-		_ = openuri.OpenURI("", mpvWebsiteURL, nil)
+			warningDialog.Close()
 
-		warningDialog.Close()
+			os.Exit(0)
 
-		os.Exit(0)
-	})
+		case responseDownloadWebsite:
+			_ = openuri.OpenURI("", mpvWebsiteURL, nil)
 
-	mpvManualConfigurationButton.ConnectClicked(func() {
-		warningDialog.Close()
+			warningDialog.Close()
 
-		preferencesDialog.Present(&window.Window)
-		mpvCommandInput.GrabFocus()
-	})
+			os.Exit(0)
 
-	warningDialog.SetTransientFor(&window.Window)
-	warningDialog.ConnectCloseRequest(func() (ok bool) {
-		warningDialog.Close()
-		warningDialog.SetVisible(false)
+		default:
+			warningDialog.Close()
 
-		return ok
+			preferencesDialog.Present(&window.Window)
+			mpvCommandInput.GrabFocus()
+		}
 	})
 
 	app.AddWindow(&window.Window)
@@ -764,7 +756,7 @@ func OpenAssistantWindow(
 		if oldMPVCommand := settings.String(resources.GSchemaMPVKey); strings.TrimSpace(oldMPVCommand) == "" {
 			newMPVCommand, err := mpvClient.DiscoverMPVExecutable()
 			if err != nil {
-				warningDialog.SetVisible(true)
+				warningDialog.Present(&window.Window)
 
 				return
 			}

internal/resources/error.ui

@@ -3,7 +3,6 @@
   <requires lib="gtk" version="4.0" />
   <object class="AdwAlertDialog" id="error-dialog">
     <property name="heading">A Fatal Error Occured</property>
-    <property name="body"></property>
     <property name="default-response">save</property>
     <property name="close-response">report</property>
 

internal/resources/resources.go

@@ -38,9 +38,6 @@ var GResourceControlsPath = path.Join(gResourceAppPath, "controls.ui")
 //go:generate blueprint-compiler compile --output description.ui description.blp
 var GResourceDescriptionPath = path.Join(gResourceAppPath, "description.ui")
 
-//go:generate blueprint-compiler compile --output warning.ui warning.blp
-var GResourceWarningPath = path.Join(gResourceAppPath, "warning.ui")
-
 //go:generate blueprint-compiler compile --output menu.ui menu.blp
 var GResourceMenuPath = path.Join(gResourceAppPath, "menu.ui")
 
@@ -51,6 +48,7 @@ var GResourcePreferencesPath = path.Join(gResourceAppPath, "preferences.ui")
 var GResourcePreparingPath = path.Join(gResourceAppPath, "preparing.ui")
 
 var GResourceErrorPath = path.Join(gResourceAppPath, "error.ui")
+var GResourceWarningPath = path.Join(gResourceAppPath, "warning.ui")
 var GResourceSubtitlesPath = path.Join(gResourceAppPath, "subtitles.ui")
 var GResourceAudiotracksPath = path.Join(gResourceAppPath, "audiotracks.ui")
 

internal/resources/warning.ui

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0" />
+  <requires lib="adwaita" version="1.0" />
+  <object class="AdwAlertDialog" id="warning-dialog">
+    <property name="heading">No Media Player Could Be Found</property>
+    <property name="body">Please install mpv or configure the existing installation to be able to play media.</property>
+    <property name="default-response">download-website</property>
+    <property name="close-response">manual-configuration</property>
+
+    <responses>
+      <response id="download-flathub" appearance="suggested" enabled="false">Get from Flathub</response>
+      <response id="download-website">Get from mpv.io</response>
+      <response id="manual-configuration">Manual configuration</response>
+    </responses>
+  </object>
+</interface>