Changed return type of LaunchConfiguration from `Task<Gtk.ResponseT…

…ype>` to `Task<bool>`
PintaProject · Oct 3, 2024 · 6bff15e · 6bff15e
1 parent 1ed6ba5
commit 6bff15e
Show file tree

Hide file tree

Showing 47 changed files with 67 additions and 72 deletions.
diff --git a/Pinta.Core/Effects/BaseEffect.cs b/Pinta.Core/Effects/BaseEffect.cs
@@ -84,12 +84,13 @@ public abstract class BaseEffect
 	/// Launches the configuration dialog for this effect/adjustment.
 	/// If IsConfigurable is true, the ConfigDialogResponse event will be invoked when the user accepts or cancels the dialog.
 	/// </summary>
-	public virtual Task<Gtk.ResponseType> LaunchConfiguration ()
+	/// <returns>Whether the user's response was positive or negative</returns>
+	public virtual Task<bool> LaunchConfiguration ()
 	{
 		if (IsConfigurable)
 			throw new NotImplementedException ($"{GetType ()} is marked as configurable, but has not implemented LaunchConfiguration");
 
-		return Task.FromResult (Gtk.ResponseType.Ok); // Placeholder
+		return Task.FromResult (true); // Placeholder
 	}
 
 	/// <summary>
@@ -99,7 +100,7 @@ public abstract class BaseEffect
 	/// The localizer for the effect add-in. This is used to fetch translations for the
 	/// strings in the dialog.
 	/// </param>
-	protected Task<Gtk.ResponseType> LaunchSimpleEffectDialog (AddinLocalizer localizer)
+	protected Task<bool> LaunchSimpleEffectDialog (AddinLocalizer localizer)
 	{
 		return PintaCore.Chrome.LaunchSimpleEffectDialog (this, new AddinLocalizerWrapper (localizer));
 	}

diff --git a/Pinta.Core/Managers/ChromeManager.cs b/Pinta.Core/Managers/ChromeManager.cs
@@ -33,7 +33,7 @@ namespace Pinta.Core;
 public interface IChromeService
 {
 	Gtk.Window MainWindow { get; }
-	Task<Gtk.ResponseType> LaunchSimpleEffectDialog (BaseEffect effect, IAddinLocalizer localizer);
+	Task<bool> LaunchSimpleEffectDialog (BaseEffect effect, IAddinLocalizer localizer);
 }
 
 public sealed class ChromeManager : IChromeService
@@ -60,11 +60,8 @@ public sealed class ChromeManager : IChromeService
 	public Gio.Menu AdjustmentsMenu { get; private set; } = null!;
 	public Gio.Menu EffectsMenu { get; private set; } = null!;
 
-	public ChromeManager ()
-	{
-	}
+	public ChromeManager () { }
 
-	#region Public Properties
 	public PointI LastCanvasCursorPoint {
 		get => last_canvas_cursor_point;
 		set {
@@ -86,9 +83,7 @@ public bool MainWindowBusy {
 				MainWindow.Cursor = Gdk.Cursor.NewFromName (Pinta.Resources.StandardCursors.Default, null);
 		}
 	}
-	#endregion
 
-	#region Public Methods
 	public void InitializeApplication (Gtk.Application application)
 	{
 		Application = application;
@@ -165,11 +160,10 @@ public void SetStatusBarText (string text)
 		OnStatusBarTextChanged (text);
 	}
 
-	public Task<Gtk.ResponseType> LaunchSimpleEffectDialog (BaseEffect effect, IAddinLocalizer localizer)
+	public Task<bool> LaunchSimpleEffectDialog (BaseEffect effect, IAddinLocalizer localizer)
 	{
 		return simple_effect_dialog_handler (effect, localizer);
 	}
-	#endregion
 
 	private void OnLastCanvasCursorPointChanged ()
 	{
@@ -181,10 +175,8 @@ private void OnStatusBarTextChanged (string text)
 		StatusBarTextChanged?.Invoke (this, new TextChangedEventArgs (text));
 	}
 
-	#region Public Events
 	public event EventHandler? LastCanvasCursorPointChanged;
 	public event EventHandler<TextChangedEventArgs>? StatusBarTextChanged;
-	#endregion
 }
 
 public interface IProgressDialog
@@ -199,4 +191,4 @@ public interface IProgressDialog
 
 public delegate void ErrorDialogHandler (Gtk.Window parent, string message, string body, string details);
 public delegate void MessageDialogHandler (Gtk.Window parent, string message, string body);
-public delegate Task<Gtk.ResponseType> SimpleEffectDialogHandler (BaseEffect effect, IAddinLocalizer localizer);
+public delegate Task<bool> SimpleEffectDialogHandler (BaseEffect effect, IAddinLocalizer localizer);
diff --git a/Pinta.Core/Managers/LivePreviewManager.cs b/Pinta.Core/Managers/LivePreviewManager.cs
@@ -138,9 +138,9 @@ public async void Start (BaseEffect effect)
 
 		if (effect.IsConfigurable) {
 
-			Gtk.ResponseType response = await effect.LaunchConfiguration ();
+			bool response = await effect.LaunchConfiguration ();
 			chrome_manager.MainWindowBusy = true;
-			if (response == Gtk.ResponseType.Ok)
+			if (response)
 				Apply ();
 			else
 				Cancel ();

diff --git a/Pinta.Effects/Adjustments/BrightnessContrastEffect.cs b/Pinta.Effects/Adjustments/BrightnessContrastEffect.cs
@@ -51,7 +51,7 @@ void HandleEffectDataPropertyChanged (object? sender, System.ComponentModel.Prop
 		table_calculated = false;
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	public override void Render (ImageSurface src, ImageSurface dest, ReadOnlySpan<RectangleI> rois)

diff --git a/Pinta.Effects/Adjustments/CurvesEffect.cs b/Pinta.Effects/Adjustments/CurvesEffect.cs
@@ -41,17 +41,17 @@ public CurvesEffect (IServiceProvider services)
 		EffectData = new CurvesData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 	{
-		TaskCompletionSource<Gtk.ResponseType> completionSource = new ();
+		TaskCompletionSource<bool> completionSource = new ();
 
 		CurvesDialog dialog = new (chrome, Data) {
 			Title = Name,
 			IconName = Icon,
 		};
 
 		dialog.OnResponse += (_, args) => {
-			completionSource.SetResult ((Gtk.ResponseType) args.ResponseId);
+			completionSource.SetResult (Gtk.ResponseType.Ok == (Gtk.ResponseType) args.ResponseId);
 			dialog.Destroy ();
 		};
 

diff --git a/Pinta.Effects/Adjustments/HueSaturationEffect.cs b/Pinta.Effects/Adjustments/HueSaturationEffect.cs
@@ -35,7 +35,7 @@ public HueSaturationEffect (IServiceProvider services)
 		EffectData = new HueSaturationData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	private UnaryPixelOp CreateOptimalOp ()

diff --git a/Pinta.Effects/Adjustments/LevelsEffect.cs b/Pinta.Effects/Adjustments/LevelsEffect.cs
@@ -41,17 +41,17 @@ public LevelsEffect (IServiceProvider services)
 		EffectData = new LevelsData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 	{
-		TaskCompletionSource<Gtk.ResponseType> completionSource = new ();
+		TaskCompletionSource<bool> completionSource = new ();
 
 		LevelsDialog dialog = new (chrome, workspace, Data) {
 			Title = Name,
 			IconName = Icon,
 		};
 
 		dialog.OnResponse += (_, args) => {
-			completionSource.SetResult ((Gtk.ResponseType) args.ResponseId);
+			completionSource.SetResult (Gtk.ResponseType.Ok == (Gtk.ResponseType) args.ResponseId);
 			dialog.Destroy ();
 		};
 

diff --git a/Pinta.Effects/Adjustments/PosterizeEffect.cs b/Pinta.Effects/Adjustments/PosterizeEffect.cs
@@ -39,9 +39,9 @@ public PosterizeEffect (IServiceProvider services)
 		EffectData = new PosterizeData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 	{
-		TaskCompletionSource<Gtk.ResponseType> completionSource = new ();
+		TaskCompletionSource<bool> completionSource = new ();
 
 		PosterizeDialog dialog = new (chrome) {
 			Title = Name,
@@ -50,7 +50,7 @@ public PosterizeEffect (IServiceProvider services)
 		};
 
 		dialog.OnResponse += (_, args) => {
-			completionSource.SetResult ((Gtk.ResponseType) args.ResponseId);
+			completionSource.SetResult (Gtk.ResponseType.Ok == (Gtk.ResponseType) args.ResponseId);
 			dialog.Destroy ();
 		};
 

diff --git a/Pinta.Effects/Effects/AddNoiseEffect.cs b/Pinta.Effects/Effects/AddNoiseEffect.cs
@@ -43,7 +43,7 @@ public AddNoiseEffect (IServiceProvider services)
 		EffectData = new NoiseData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/AlignObjectEffect.cs b/Pinta.Effects/Effects/AlignObjectEffect.cs
@@ -27,19 +27,21 @@ public AlignObjectEffect (IServiceProvider services)
 		chrome = services.GetService<IChromeService> ();
 		EffectData = new AlignObjectData ();
 	}
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 	{
-		TaskCompletionSource<Gtk.ResponseType> completionSource = new ();
+		TaskCompletionSource<bool> completionSource = new ();
 
 		AlignmentDialog dialog = new (chrome);
 
 		// Align to the default position
 		Data.Position = dialog.SelectedPosition;
 
-		dialog.PositionChanged += (_, _) => Data.Position = dialog.SelectedPosition;
+		dialog.PositionChanged += (_, _) => {
+			Data.Position = dialog.SelectedPosition;
+		};
 
 		dialog.OnResponse += (_, args) => {
-			completionSource.SetResult ((Gtk.ResponseType) args.ResponseId);
+			completionSource.SetResult (Gtk.ResponseType.Ok == (Gtk.ResponseType) args.ResponseId);
 			dialog.Destroy ();
 		};
 

diff --git a/Pinta.Effects/Effects/BulgeEffect.cs b/Pinta.Effects/Effects/BulgeEffect.cs
@@ -37,7 +37,7 @@ public BulgeEffect (IServiceProvider services)
 		EffectData = new BulgeData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/CloudsEffect.cs b/Pinta.Effects/Effects/CloudsEffect.cs
@@ -51,7 +51,7 @@ public CloudsEffect (IServiceProvider services)
 		EffectData = new CloudsData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/DitheringEffect.cs b/Pinta.Effects/Effects/DitheringEffect.cs
@@ -25,7 +25,7 @@ public DitheringEffect (IServiceProvider services)
 		EffectData = new DitheringData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	private sealed record DitheringSettings (

diff --git a/Pinta.Effects/Effects/EdgeDetectEffect.cs b/Pinta.Effects/Effects/EdgeDetectEffect.cs
@@ -42,7 +42,7 @@ public EdgeDetectEffect (IServiceProvider services)
 		EffectData = new EdgeDetectData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	public override void Render (ImageSurface src, ImageSurface dest, ReadOnlySpan<RectangleI> rois)

diff --git a/Pinta.Effects/Effects/EmbossEffect.cs b/Pinta.Effects/Effects/EmbossEffect.cs
@@ -42,7 +42,7 @@ public EmbossEffect (IServiceProvider services)
 		EffectData = new EmbossData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/FeatherEffect.cs b/Pinta.Effects/Effects/FeatherEffect.cs
@@ -34,7 +34,7 @@ public FeatherEffect (IServiceProvider services)
 		EffectData = new FeatherData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	protected override void Render (

diff --git a/Pinta.Effects/Effects/FragmentEffect.cs b/Pinta.Effects/Effects/FragmentEffect.cs
@@ -44,7 +44,7 @@ public FragmentEffect (IServiceProvider services)
 		EffectData = new FragmentData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/FrostedGlassEffect.cs b/Pinta.Effects/Effects/FrostedGlassEffect.cs
@@ -37,7 +37,7 @@ public FrostedGlassEffect (IServiceProvider services)
 		EffectData = new FrostedGlassData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/GaussianBlurEffect.cs b/Pinta.Effects/Effects/GaussianBlurEffect.cs
@@ -38,7 +38,7 @@ public GaussianBlurEffect (IServiceProvider services)
 		EffectData = new GaussianBlurData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/GlowEffect.cs b/Pinta.Effects/Effects/GlowEffect.cs
@@ -42,7 +42,7 @@ public GlowEffect (IServiceProvider services)
 		this.services = services;
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/InkSketchEffect.cs b/Pinta.Effects/Effects/InkSketchEffect.cs
@@ -61,7 +61,7 @@ static InkSketchEffect ()
 		);
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/JuliaFractalEffect.cs b/Pinta.Effects/Effects/JuliaFractalEffect.cs
@@ -45,7 +45,7 @@ public JuliaFractalEffect (IServiceProvider services)
 		EffectData = new JuliaFractalData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/MandelbrotFractalEffect.cs b/Pinta.Effects/Effects/MandelbrotFractalEffect.cs
@@ -46,7 +46,7 @@ public MandelbrotFractalEffect (IServiceProvider services)
 		EffectData = new MandelbrotFractalData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/MedianEffect.cs b/Pinta.Effects/Effects/MedianEffect.cs
@@ -40,7 +40,7 @@ public MedianEffect (IServiceProvider services)
 		EffectData = new MedianData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/MotionBlurEffect.cs b/Pinta.Effects/Effects/MotionBlurEffect.cs
@@ -44,7 +44,7 @@ public MotionBlurEffect (IServiceProvider services)
 		EffectData = new MotionBlurData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/OilPaintingEffect.cs b/Pinta.Effects/Effects/OilPaintingEffect.cs
@@ -37,7 +37,7 @@ public OilPaintingEffect (IServiceProvider services)
 		EffectData = new OilPaintingData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/OutlineEdgeEffect.cs b/Pinta.Effects/Effects/OutlineEdgeEffect.cs
@@ -40,7 +40,7 @@ public OutlineEdgeEffect (IServiceProvider services)
 		EffectData = new OutlineEdgeData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/OutlineObjectEffect.cs b/Pinta.Effects/Effects/OutlineObjectEffect.cs
@@ -36,7 +36,7 @@ public OutlineObjectEffect (IServiceProvider services)
 		EffectData = new OutlineObjectData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	protected override void Render (ImageSurface src, ImageSurface dest, RectangleI roi)

diff --git a/Pinta.Effects/Effects/PencilSketchEffect.cs b/Pinta.Effects/Effects/PencilSketchEffect.cs
@@ -50,7 +50,7 @@ public PencilSketchEffect (IServiceProvider services)
 		color_dodge_op = new UserBlendOps.ColorDodgeBlendOp ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN

diff --git a/Pinta.Effects/Effects/PixelateEffect.cs b/Pinta.Effects/Effects/PixelateEffect.cs
@@ -38,7 +38,7 @@ public PixelateEffect (IServiceProvider services)
 		EffectData = new PixelateData ();
 	}
 
-	public override Task<Gtk.ResponseType> LaunchConfiguration ()
+	public override Task<bool> LaunchConfiguration ()
 		=> chrome.LaunchSimpleEffectDialog (this);
 
 	#region Algorithm Code Ported From PDN