PintaProject · cameronwhite · May 15, 2025 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025
diff --git a/Pinta.Core/Actions/Command.cs b/Pinta.Core/Actions/Command.cs
@@ -91,7 +91,7 @@ public ToggleCommand (string name, string label, string? tooltip, string? stock_
 	{
 		Activated += (o, args) => {
 			bool active = !State.GetBoolean ();
-			Toggled?.Invoke (active);
+			Toggled?.Invoke (active, interactive: true);
 			Action.ChangeState (GLib.Variant.NewBoolean (active));
 		};
 	}
@@ -100,13 +100,13 @@ public bool Value {
 		get => State.GetBoolean ();
 		set {
 			if (value != Value) {
-				Toggled?.Invoke (value);
+				Toggled?.Invoke (value, interactive: false);
 				Action.ChangeState (GLib.Variant.NewBoolean (value));
 			}
 		}
 	}
 
-	public delegate void ToggledHandler (bool value);
+	public delegate void ToggledHandler (bool value, bool interactive);
 	public ToggledHandler? Toggled;
 
 	private GLib.Variant State => Action.GetState () ?? throw new InvalidOperationException ("Action should not be stateless!");

diff --git a/Pinta.Core/Actions/ViewActions.cs b/Pinta.Core/Actions/ViewActions.cs
@@ -41,6 +41,7 @@ public sealed class ViewActions
 	public ToggleCommand ImageTabs { get; }
 	public ToggleCommand ToolWindows { get; }
 	public Command EditCanvasGrid { get; }
+	public ToggleCommand MenuBar { get; }
 	public ToggleCommand StatusBar { get; }
 	public ToggleCommand ToolBox { get; }
 	public ToggleCommand Rulers { get; }
@@ -124,6 +125,12 @@ public ViewActions (ChromeManager chrome, WorkspaceManager workspace)
 			null,
 			Resources.Icons.ViewGrid);
 
+		MenuBar = new ToggleCommand (
+			"MenuBar",
+			Translations.GetString ("Menu Bar"),
+			null,
+			null);
+
 		StatusBar = new ToggleCommand (
 			"Statusbar",
 			Translations.GetString ("Status Bar"),
@@ -226,6 +233,7 @@ public void RegisterActions (Gtk.Application app, Gio.Menu menu)
 
 		Gio.Menu show_hide_menu = Gio.Menu.New ();
 		show_hide_menu.AppendItem (Rulers.CreateMenuItem ());
+		show_hide_menu.AppendItem (MenuBar.CreateMenuItem ());
 		show_hide_menu.AppendItem (StatusBar.CreateMenuItem ());
 		show_hide_menu.AppendItem (ToolBox.CreateMenuItem ());
 		show_hide_menu.AppendItem (ImageTabs.CreateMenuItem ());
@@ -260,6 +268,7 @@ public void RegisterActions (Gtk.Application app, Gio.Menu menu)
 			Fullscreen,
 			EditCanvasGrid,
 			Rulers,
+			MenuBar,
 			StatusBar,
 			ToolBox,
 			ImageTabs,

diff --git a/Pinta/ActionHandlers.cs b/Pinta/ActionHandlers.cs
@@ -78,6 +78,7 @@ public ActionHandlers ()
 			new RotateZoomLayerAction (chrome, actions.Layers, workspace, tools),
 
 			// View
+			new MenuBarToggledAction (actions.View, chrome),
 			new ToolBarToggledAction (actions.View, chrome),
 			new ImageTabsToggledAction (actions.View, chrome),
 			new ToolWindowsToggledAction (actions.View, chrome),

diff --git a/Pinta/Actions/View/ImageTabsToggledAction.cs b/Pinta/Actions/View/ImageTabsToggledAction.cs
@@ -50,7 +50,7 @@ void IActionHandler.Uninitialize ()
 		view.ImageTabs.Toggled -= Activated;
 	}
 
-	private void Activated (bool value)
+	private void Activated (bool value, bool interactive)
 	{
 		var notebook = (Docking.DockNotebook) chrome.ImageTabsNotebook;
 		notebook.EnableTabs = value;

diff --git a/Pinta/Actions/View/MenuBarToggledAction.cs b/Pinta/Actions/View/MenuBarToggledAction.cs
@@ -0,0 +1,43 @@
+using Gio;
+using Pinta.Core;
+
+namespace Pinta.Actions;
+
+internal sealed class MenuBarToggledAction : IActionHandler
+{
+	private readonly ViewActions view;
+	private readonly ChromeManager chrome;
+
+	internal MenuBarToggledAction (
+		ViewActions view,
+		ChromeManager chrome)
+	{
+		this.view = view;
+		this.chrome = chrome;
+	}
+
+	void IActionHandler.Initialize ()
+	{
+		view.MenuBar.Toggled += Activated;
+	}
+
+	void IActionHandler.Uninitialize ()
+	{
+		view.MenuBar.Toggled -= Activated;
+	}
+
+	private async void Activated (bool value, bool interactive)
+	{
+		if (!interactive)
+			return;
+
+		// Changing the setting requires a restart since the application window is
+		// constructed differently (see WindowShell). Only show this when the user
+		// changes the option, not when the setting is loaded on startup!
+		await chrome.ShowMessageDialog (
+			chrome.MainWindow,
+			Translations.GetString ("Restart Pinta"),
+			Translations.GetString ("Please restart Pinta for the changes to take effect."));
+	}
+}
+
diff --git a/Pinta/Actions/View/StatusBarToggledAction.cs b/Pinta/Actions/View/StatusBarToggledAction.cs
@@ -50,7 +50,7 @@ void IActionHandler.Uninitialize ()
 		view.StatusBar.Toggled -= Activated;
 	}
 
-	private void Activated (bool value)
+	private void Activated (bool value, bool interactive)
 	{
 		chrome.StatusBar.Visible = value;
 	}

diff --git a/Pinta/Actions/View/ToolBarToggledAction.cs b/Pinta/Actions/View/ToolBarToggledAction.cs
@@ -50,7 +50,7 @@ void IActionHandler.Uninitialize ()
 		view.ToolBar.Toggled -= Activated;
 	}
 
-	private void Activated (bool value)
+	private void Activated (bool value, bool interactive)
 	{
 		if (chrome.MainToolBar is not null)
 			chrome.MainToolBar.Visible = value;

diff --git a/Pinta/Actions/View/ToolBoxToggledAction.cs b/Pinta/Actions/View/ToolBoxToggledAction.cs
@@ -50,7 +50,7 @@ void IActionHandler.Uninitialize ()
 		view.ToolBox.Toggled -= Activated;
 	}
 
-	private void Activated (bool value)
+	private void Activated (bool value, bool interactive)
 	{
 		chrome.ToolBox.Visible = value;
 	}

diff --git a/Pinta/Actions/View/ToolWindowsToggledAction.cs b/Pinta/Actions/View/ToolWindowsToggledAction.cs
@@ -24,11 +24,9 @@ void IActionHandler.Uninitialize ()
 		view.ToolWindows.Toggled -= Activated;
 	}
 
-	private void Activated (bool value)
+	private void Activated (bool value, bool interactive)
 	{
 		var dock = (Docking.Dock) chrome.Dock;
 		dock.RightPanel.Visible = value;
-
-		System.Console.WriteLine ($"visible {value}");
 	}
 }
diff --git a/Pinta/Main.cs b/Pinta/Main.cs
@@ -98,6 +98,8 @@ private static void OpenMainWindow (int threads, IEnumerable<string> files, bool
 		if (threads > 0)
 			PintaCore.System.RenderThreads = threads;
 
+		app.OnStartup += (_, _) => main_window.Startup ();
+
 		app.OnActivate += (_, _) => {
 			main_window.Activate ();
 			OpenFilesFromCommandLine (files);