All - CmdOptions For Color Changing

Fixes #137

Author: nlogozzo

NickvisionCavalier.GNOME/Program.cs

@@ -34,6 +34,7 @@ public Program(string[] args)
         _mainWindowController = new MainWindowController(args);
         _mainWindowController.AppInfo.Changelog =
             @"* The wave box drawing mode now draws smoother bezier curves (Thanks @OggyP)
+              * Users can now specify `--fg aarrggbb` or `--bg aarrggbb` command line arguments to change the foreground and background color of the running Cavalier instance respectively
               * Updated translations (Thanks everyone on Weblate!)";
         _application.OnActivate += OnActivate;
         if (File.Exists(Path.GetFullPath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)) + "/org.nickvision.cavalier.gresource"))

NickvisionCavalier.GNOME/Views/PreferencesDialog.cs

@@ -1107,18 +1107,14 @@ private void UpdateColorsGrid()
         }
         for (var i = 0; i < _controller.ColorProfiles[_controller.ActiveProfile].FgColors.Count; i++)
         {
-            var colorButton = new ColorBox(
-                _controller.ColorProfiles[_controller.ActiveProfile].FgColors[i],
-                ColorType.Foreground, i, i != 0);
+            var colorButton = new ColorBox(_controller.ColorProfiles[_controller.ActiveProfile].FgColors[i], ColorType.Foreground, i, i != 0);
             colorButton.OnEdit += OnEditColor;
             colorButton.OnDelete += OnDeleteColor;
             _colorsGrid.Attach(colorButton, 0, i + 1, 1, 1);
         }
         for (var i = 0; i < _controller.ColorProfiles[_controller.ActiveProfile].BgColors.Count; i++)
         {
-            var colorButton = new ColorBox(
-                _controller.ColorProfiles[_controller.ActiveProfile].BgColors[i],
-                ColorType.Background, i, i != 0);
+            var colorButton = new ColorBox(_controller.ColorProfiles[_controller.ActiveProfile].BgColors[i], ColorType.Background, i, i != 0);
             colorButton.OnEdit += OnEditColor;
             colorButton.OnDelete += OnDeleteColor;
             _colorsGrid.Attach(colorButton, 1, i + 1, 1, 1);

NickvisionCavalier.Shared/Controllers/PreferencesViewController.cs

@@ -1,5 +1,6 @@
 using CommandLine;
 using CommandLine.Text;
+using Markdig.Helpers;
 using Nickvision.Aura;
 using NickvisionCavalier.Shared.Models;
 using System;
@@ -532,6 +533,22 @@ public void HandleCommandLine(object? sender, string[] args)
                     updateCavalier = true;
                 }
             }
+            if (!string.IsNullOrEmpty(o.BgColor) && (o.BgColor!.Length == 6 || o.BgColor!.Length == 8))
+            {
+                if(o.BgColor.Length == 6)
+                {
+                    o.BgColor = $"ff{o.BgColor}";
+                }
+                foreach (var c in o.BgColor)
+                {
+                    if (!c.IsDigit() && c < 'a' && c > 'f') //hex can be any digit or a-f
+                    {
+                        return;
+                    }
+                }
+                EditColor(ColorType.Background, 0, $"#{o.BgColor}");
+                updateCavalier = true;
+            }
             if (o.BgImageIndex.HasValue)
             {
                 if (o.BgImageIndex.Value > -1 && o.BgImageIndex.Value <= ImagesList.Count)
@@ -550,6 +567,22 @@ public void HandleCommandLine(object? sender, string[] args)
                 BgImageAlpha = Math.Max(0.1f, Math.Min(o.BgImageAlpha.Value / 100f, 1f));
                 updateCavalier = true;
             }
+            if (!string.IsNullOrEmpty(o.FgColor) && (o.FgColor!.Length == 6 || o.FgColor!.Length == 8))
+            {
+                if (o.FgColor.Length == 6)
+                {
+                    o.FgColor = $"ff{o.FgColor}";
+                }
+                foreach (var c in o.FgColor) //hex can be any digit or a-f
+                {
+                    if (!c.IsDigit() && (c < 'a' || c > 'f'))
+                    {
+                        return;
+                    }
+                }
+                EditColor(ColorType.Foreground, 0, $"#{o.FgColor}");
+                updateCavalier = true;
+            }
             if (o.FgImageIndex.HasValue)
             {
                 if (o.FgImageIndex.Value > -1 && o.FgImageIndex.Value <= ImagesList.Count)

NickvisionCavalier.Shared/Linux/org.nickvision.cavalier.metainfo.xml.in

@@ -50,6 +50,7 @@
     <release version="2024.1.0-next" date="2024-01-01">
       <description translatable="no">
         <p>- The wave box drawing mode now draws smoother bezier curves (Thanks @OggyP)</p>
+        <p>- Users can now specify `--fg aarrggbb` or `--bg aarrggbb` command line arguments to change the foreground and background color of the running Cavalier instance respectively</p>
         <p>- Updated translations (Thanks everyone on Weblate!)</p>
       </description>
     </release>

NickvisionCavalier.Shared/Models/CmdOptions.cs

@@ -103,6 +103,11 @@ public class CmdOptions
     [Option('p', "profile", Required = false, HelpText = "Zero-based index of profile to activate")]
     public uint? ActiveProfile { get; set; }
     /// <summary>
+    /// Active background color
+    /// </summary>
+    [Option("bg", Required = false, HelpText = "Background color, hex format: aarrbbgg or rrbbgg")]
+    public string? BgColor { get; set; }
+    /// <summary>
     /// Index of a background image to load (0 to not load anything)
     /// </summary>
     [Option("bg-index", Required = false, HelpText = "Index of background image to draw (0 for no image)")]
@@ -118,14 +123,19 @@ public class CmdOptions
     [Option("bg-alpha", Required = false, HelpText = "Background image alpha in percent (10-100)")]
     public uint? BgImageAlpha { get; set; }
     /// <summary>
-    /// Index of a background image to load (0 to not load anything)
+    /// Active forground color
+    /// </summary>
+    [Option("fg", Required = false, HelpText = "Foreground color, hex format: aarrbbgg or rrbbgg")]
+    public string? FgColor { get; set; }
+    /// <summary>
+    /// Index of a foreground image to load (0 to not load anything)
     /// </summary>
     [Option("fg-index", Required = false, HelpText = "Index of foreground image to draw (0 for no image)")]
     public int? FgImageIndex { get; set; }
     /// <summary>
-    /// Background image scale (10-100, 100 - fill the window)
+    /// Foreground image scale (10-100, 100 - fill the window)
     /// </summary>
-    [Option("fg-scale", Required = false, HelpText = "Background image scale in percent (10-100)")]
+    [Option("fg-scale", Required = false, HelpText = "Foreground image scale in percent (10-100)")]
     public uint? FgImageScale { get; set; }
     /// <summary>
     /// Foreground image transparency (10-100, 100 - fully opaque)