Port several more dialogs to the new subclass init style

Author: cameronwhite

Pinta.Gui.Widgets/Widgets/ToolBoxWidget.cs

@@ -4,28 +4,35 @@
 
 namespace Pinta.Gui.Widgets;
 
-public sealed class ToolBoxWidget : Gtk.FlowBox
+[GObject.Subclass<Gtk.FlowBox>]
+public sealed partial class ToolBoxWidget
 {
-	private readonly ToolManager tools;
-	// Stores the button corresponding to each tool.
+	private ToolManager tools = null!; // NRT - set in factory method
+					   // Stores the button corresponding to each tool.
 	private readonly Dictionary<BaseTool, Gtk.ToggleButton> tool_buttons = new ();
 	// Dummy ToggleButton to use for grouping together the tools' buttons.
 	private readonly Gtk.ToggleButton toggle_group = Gtk.ToggleButton.New ();
 
-	public ToolBoxWidget (ToolManager tools)
+	partial void Initialize ()
 	{
-		tools.ToolAdded += (_, e) => HandleToolAdded (e.Tool);
-		tools.ToolRemoved += (_, e) => HandleToolRemoved (e.Tool);
-		tools.ToolActivated += (_, e) => HandleToolActivated (e.Tool);
-
-		// --- Initialization (Gtk.FlowBox)
-
 		SetOrientation (Gtk.Orientation.Vertical);
 		MinChildrenPerLine = 8; // Pinta 3 has 22 default tools, meaning a max of 3 columns regardless of size, smaller values don't lead to better use of visual space.
 		MaxChildrenPerLine = 1024; // Allow for single column if there's sufficient space to do so.
 		SelectionMode = Gtk.SelectionMode.None; // Don't allow the buttons to be selected.
+	}
 
-		// --- References to keep
+	public static ToolBoxWidget New (ToolManager tools)
+	{
+		ToolBoxWidget widget = NewWithProperties ([]);
+		widget.Configure (tools);
+		return widget;
+	}
+
+	private void Configure (ToolManager tools)
+	{
+		tools.ToolAdded += (_, e) => HandleToolAdded (e.Tool);
+		tools.ToolRemoved += (_, e) => HandleToolRemoved (e.Tool);
+		tools.ToolActivated += (_, e) => HandleToolActivated (e.Tool);
 
 		this.tools = tools;
 	}

Pinta/Actions/File/ModifyCompressionAction.cs

@@ -1,21 +1,21 @@
-// 
+//
 // ModifyCompressionAction.cs
-//  
+//
 // Author:
 //       Jonathan Pobst <monkey@jpobst.com>
-// 
+//
 // Copyright (c) 2010 Jonathan Pobst
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -48,7 +48,7 @@ void IActionHandler.Uninitialize ()
 
 	private void Activated (object? sender, ModifyCompressionEventArgs e)
 	{
-		JpegCompressionDialog dlg = new (e.Quality, e.ParentWindow);
+		JpegCompressionDialog dlg = JpegCompressionDialog.New (e.Quality, e.ParentWindow);
 
 		if (dlg.RunBlocking () == Gtk.ResponseType.Ok)
 			e.Quality = dlg.CompressionLevel;

Pinta/Actions/Layers/LayerPropertiesAction.cs

@@ -1,21 +1,21 @@
-// 
+//
 // LayerPropertiesAction.cs
-//  
+//
 // Author:
 //       Jonathan Pobst <monkey@jpobst.com>
-// 
+//
 // Copyright (c) 2010 Jonathan Pobst
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -57,7 +57,7 @@ void IActionHandler.Uninitialize ()
 	private async void Activated (object sender, EventArgs e)
 	{
 		Document active = workspace.ActiveDocument;
-		using LayerPropertiesDialog dialog = new (chrome, workspace);
+		using LayerPropertiesDialog dialog = LayerPropertiesDialog.New (chrome, workspace);
 		try {
 			Gtk.ResponseType response = await dialog.RunAsync ();
 

Pinta/Dialogs/JpegCompressionDialog.cs

@@ -1,21 +1,21 @@
-// 
+//
 // JpegCompressionDialog.cs
-//  
+//
 // Author:
 //       Maia Kozheva <sikon@ubuntu.com>
-// 
+//
 // Copyright (c) 2010 Maia Kozheva
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,27 +24,28 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using System.Diagnostics.CodeAnalysis;
 using Pinta.Core;
 
 namespace Pinta;
 
-public sealed class JpegCompressionDialog : Gtk.Dialog
+[GObject.Subclass<Gtk.Dialog>]
+public sealed partial class JpegCompressionDialog
 {
-	private readonly Gtk.Scale compression_level;
+	private Gtk.Scale compression_level;
 
-	public JpegCompressionDialog (int defaultQuality, Gtk.Window parent)
+	[MemberNotNull (nameof (compression_level))]
+	partial void Initialize ()
 	{
 		Gtk.Label qualityLabel = Gtk.Label.New (Translations.GetString ("Quality: "));
 		qualityLabel.Xalign = 0;
 
 		Gtk.Scale levelScale = Gtk.Scale.NewWithRange (Gtk.Orientation.Horizontal, 1, 100, 1);
-		levelScale.SetValue (defaultQuality);
 		levelScale.DrawValue = true;
 
 		// --- Initialization (Gtk.Window)
 
 		Title = Translations.GetString ("JPEG Quality");
-		TransientFor = parent;
 		Modal = true;
 
 		// --- Initialization (Gtk.Dialog)
@@ -64,6 +65,14 @@ public JpegCompressionDialog (int defaultQuality, Gtk.Window parent)
 		compression_level = levelScale;
 	}
 
+	public static JpegCompressionDialog New (int defaultQuality, Gtk.Window parent)
+	{
+		JpegCompressionDialog dialog = NewWithProperties ([]);
+		dialog.compression_level.SetValue (defaultQuality);
+		dialog.TransientFor = parent;
+		return dialog;
+	}
+
 	public int CompressionLevel
 		=> (int) compression_level.GetValue ();
 }

Pinta/Dialogs/LayerPropertiesDialog.cs

@@ -26,72 +26,60 @@
 
 using System;
 using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 using Pinta.Core;
 
 namespace Pinta;
 
-public sealed class LayerPropertiesDialog : Gtk.Dialog
+[GObject.Subclass<Gtk.Dialog>]
+public sealed partial class LayerPropertiesDialog
 {
-	private readonly LayerProperties initial_properties;
+	private LayerProperties initial_properties = new (string.Empty, false, 0.0, BlendMode.Normal);
 
 	private double current_layer_opacity;
 	private bool current_layer_hidden;
-	private string current_layer_name;
+	private string current_layer_name = string.Empty;
 	private BlendMode current_layer_blend_mode;
 
-	private readonly Gtk.Entry layer_name_entry;
-	private readonly Gtk.CheckButton visibility_checkbox;
-	private readonly Gtk.SpinButton opacity_spinner;
-	private readonly Gtk.Scale opacity_slider;
-	private readonly Gtk.ComboBoxText blend_combo_box;
+	private Gtk.Entry layer_name_entry;
+	private Gtk.CheckButton visibility_checkbox;
+	private Gtk.SpinButton opacity_spinner;
+	private Gtk.Scale opacity_slider;
+	private Gtk.ComboBoxText blend_combo_box;
 
-	private readonly WorkspaceManager workspace;
+	private WorkspaceManager workspace = null!; // NRT - set by factory method
 
-	public LayerPropertiesDialog (ChromeManager chrome, WorkspaceManager workspace)
+	[MemberNotNull (nameof (layer_name_entry))]
+	[MemberNotNull (nameof (visibility_checkbox))]
+	[MemberNotNull (nameof (opacity_slider))]
+	[MemberNotNull (nameof (opacity_spinner))]
+	[MemberNotNull (nameof (blend_combo_box))]
+	partial void Initialize ()
 	{
 		const int spacing = 6;
 
-		Document doc = workspace.ActiveDocument;
-
-		string currentLayerName = doc.Layers.CurrentUserLayer.Name;
-		bool currentLayerHidden = doc.Layers.CurrentUserLayer.Hidden;
-		double currentLayerOpacity = doc.Layers.CurrentUserLayer.Opacity;
-		BlendMode currentLayerBlendMode = doc.Layers.CurrentUserLayer.BlendMode;
-
-		LayerProperties initialProperties = new (
-			currentLayerName,
-			currentLayerHidden,
-			currentLayerOpacity,
-			currentLayerBlendMode);
-
 		Gtk.Label nameLabel = Gtk.Label.New (Translations.GetString ("Name:"));
 		nameLabel.Halign = Gtk.Align.End;
 
 		Gtk.Entry layerNameEntry = Gtk.Entry.New ();
 		layerNameEntry.Hexpand = true;
 		layerNameEntry.Halign = Gtk.Align.Fill;
-		layerNameEntry.SetText (initialProperties.Name);
 		layerNameEntry.OnChanged += OnLayerNameChanged;
 		layerNameEntry.SetActivatesDefault (true);
 
 		Gtk.CheckButton visibilityCheckbox = Gtk.CheckButton.NewWithLabel (Translations.GetString ("Visible"));
-		visibilityCheckbox.Active = !initialProperties.Hidden;
 		visibilityCheckbox.OnToggled += OnVisibilityToggled;
 
 		Gtk.Label blendLabel = Gtk.Label.New (Translations.GetString ("Blend Mode") + ":");
 		blendLabel.Halign = Gtk.Align.End;
 
-		var allBlendmodes = UserBlendOps.GetAllBlendModeNames ().ToImmutableArray ();
-		var index = allBlendmodes.IndexOf (UserBlendOps.GetBlendModeName (currentLayerBlendMode));
-
 		Gtk.ComboBoxText blendComboBox = Gtk.ComboBoxText.New ();
 
 		foreach (string name in UserBlendOps.GetAllBlendModeNames ())
 			blendComboBox.AppendText (name);
 
 		blendComboBox.Hexpand = true;
 		blendComboBox.Halign = Gtk.Align.Fill;
-		blendComboBox.Active = index;
 		blendComboBox.OnChanged += OnBlendModeChanged;
 
 		Gtk.Label opacityLabel = Gtk.Label.New (Translations.GetString ("Opacity:"));
@@ -100,7 +88,6 @@ public LayerPropertiesDialog (ChromeManager chrome, WorkspaceManager workspace)
 		Gtk.SpinButton opacitySpinner = Gtk.SpinButton.NewWithRange (0, 100, 1);
 		opacitySpinner.Adjustment!.PageIncrement = 10;
 		opacitySpinner.ClimbRate = 1;
-		opacitySpinner.Value = Math.Round (initialProperties.Opacity * 100);
 		opacitySpinner.OnValueChanged += OnOpacitySpinnerChanged;
 		opacitySpinner.SetActivatesDefaultImmediate (true);
 
@@ -109,7 +96,6 @@ public LayerPropertiesDialog (ChromeManager chrome, WorkspaceManager workspace)
 		opacitySlider.Adjustment!.PageIncrement = 10;
 		opacitySlider.Hexpand = true;
 		opacitySlider.Halign = Gtk.Align.Fill;
-		opacitySlider.SetValue (Math.Round (initialProperties.Opacity * 100));
 		opacitySlider.OnValueChanged += OnOpacitySliderChanged;
 
 		Gtk.Box opacityBox = Gtk.Box.New (Gtk.Orientation.Horizontal, spacing);
@@ -131,7 +117,6 @@ public LayerPropertiesDialog (ChromeManager chrome, WorkspaceManager workspace)
 		// --- Initialization (Gtk.Window)
 
 		Title = Translations.GetString ("Layer Properties");
-		TransientFor = chrome.MainWindow;
 		Modal = true;
 		DefaultWidth = 349;
 		DefaultHeight = 224;
@@ -156,15 +141,48 @@ public LayerPropertiesDialog (ChromeManager chrome, WorkspaceManager workspace)
 		blend_combo_box = blendComboBox;
 		opacity_spinner = opacitySpinner;
 		opacity_slider = opacitySlider;
+	}
+
+	public static LayerPropertiesDialog New (IChromeService chrome, WorkspaceManager workspace)
+	{
+		LayerPropertiesDialog dialog = NewWithProperties ([]);
+		dialog.Configure (chrome, workspace);
+		return dialog;
+	}
+
+	private void Configure (IChromeService chrome, WorkspaceManager workspace)
+	{
+		this.workspace = workspace;
+		TransientFor = chrome.MainWindow;
+
+		Document doc = workspace.ActiveDocument;
+
+		string currentLayerName = doc.Layers.CurrentUserLayer.Name;
+		bool currentLayerHidden = doc.Layers.CurrentUserLayer.Hidden;
+		double currentLayerOpacity = doc.Layers.CurrentUserLayer.Opacity;
+		BlendMode currentLayerBlendMode = doc.Layers.CurrentUserLayer.BlendMode;
+
+		LayerProperties initialProperties = new (
+			currentLayerName,
+			currentLayerHidden,
+			currentLayerOpacity,
+			currentLayerBlendMode);
+
+		layer_name_entry.SetText (initialProperties.Name);
+		visibility_checkbox.Active = !initialProperties.Hidden;
+		opacity_spinner.Value = Math.Round (initialProperties.Opacity * 100);
+		opacity_slider.SetValue (Math.Round (initialProperties.Opacity * 100));
+
+		var allBlendmodes = UserBlendOps.GetAllBlendModeNames ().ToImmutableArray ();
+		var index = allBlendmodes.IndexOf (UserBlendOps.GetBlendModeName (currentLayerBlendMode));
+		blend_combo_box.Active = index;
 
 		current_layer_name = currentLayerName;
 		current_layer_hidden = currentLayerHidden;
 		current_layer_opacity = currentLayerOpacity;
 		current_layer_blend_mode = currentLayerBlendMode;
 
 		initial_properties = initialProperties;
-
-		this.workspace = workspace;
 	}
 
 	public bool AreLayerPropertiesUpdated =>