Merge pull request #92 from NickvisionApps/beta2

2023.8.1-rc1

Author: fsobolev

NickvisionCavalier.GNOME/Blueprints/drawing_view.blp

@@ -15,6 +15,19 @@ Gtk.Stack _root {
     };
   }
 
+  Gtk.StackPage _welcomePage {
+    name: "welcome";
+    child: Adw.Bin {
+      Adw.StatusPage {
+        icon-name: "man-dancing";
+        title: _("Let's dance!");
+        description: _("Cavalier listens to your system sound. Play some music or watch a video and see your sound come to life!");
+      }
+
+      styles ["load-bin"]
+    };
+  }
+
   Gtk.StackPage _glPage {
     name: "gl";
     child: Gtk.GLArea _glArea {

NickvisionCavalier.GNOME/Blueprints/preferences_dialog.blp

@@ -93,9 +93,10 @@ Adw.PreferencesWindow _root {
     }
 
     Adw.PreferencesGroup {
+      visible: bind _boxButton.active inverted;
+
       Adw.ActionRow {
         title: _("Radius");
-        visible: bind _boxButton.active inverted;
 
         [suffix]
         Gtk.Scale _radiusScale {
@@ -108,6 +109,21 @@ Adw.PreferencesWindow _root {
           };
         }
       }
+
+      Adw.ActionRow {
+        title: _("Rotation");
+
+        [suffix]
+        Gtk.Scale _rotationScale {
+          width-request: 150;
+          draw-value: false;
+          adjustment: Gtk.Adjustment {
+            lower: 0;
+            upper: 6.284;
+            step-increment: 0.01;
+          };
+        }
+      }
     }
 
     Adw.PreferencesGroup {
@@ -132,7 +148,6 @@ Adw.PreferencesWindow _root {
         model: Gtk.StringList {
           strings [_("Top to bottom"), _("Bottom to top"), _("Left to right"), _("Right to left") ]
         };
-        sensitive: bind _boxButton.active;
       }
 
       Adw.ActionRow {
@@ -153,6 +168,36 @@ Adw.PreferencesWindow _root {
         }
       }
 
+      Adw.ActionRow {
+        title: _("Drawing area X offset");
+
+        [suffix]
+        Gtk.Scale _areaOffsetXScale {
+          width-request: 150;
+          draw-value: false;
+          adjustment: Gtk.Adjustment {
+            lower: -0.5;
+            upper: 0.5;
+            step-increment: 0.01;
+          };
+        }
+      }
+
+      Adw.ActionRow {
+        title: _("Drawing area Y offset");
+
+        [suffix]
+        Gtk.Scale _areaOffsetYScale {
+          width-request: 150;
+          draw-value: false;
+          adjustment: Gtk.Adjustment {
+            lower: -0.5;
+            upper: 0.5;
+            step-increment: 0.01;
+          };
+        }
+      }
+
       Adw.ActionRow _offsetRow {
         title: _("Offset between items");
         subtitle: _("The size of spaces between elements (in percent).");
@@ -367,14 +412,14 @@ Adw.PreferencesWindow _root {
 
         [suffix]
         Gtk.Scale _noiseReductionScale {
-          width-request: 190;
+          width-request: 180;
           draw-value: true;
           value-pos: left;
-          digits: 2;
+          digits: 0;
           adjustment: Gtk.Adjustment {
-            lower: 0.15;
-            upper: 0.95;
-            step-increment: 0.01;
+            lower: 15;
+            upper: 95;
+            step-increment: 1;
           };
         }
       }

NickvisionCavalier.GNOME/Blueprints/shortcuts_dialog.blp

@@ -22,6 +22,11 @@ Gtk.ShortcutsWindow _shortcuts {
         accelerator: "U <Shift>U";
       }
 
+      Gtk.ShortcutsShortcut {
+        title: _("Change rotation in Circle modes");
+        accelerator: "O <Shift>O";
+      }
+
       Gtk.ShortcutsShortcut {
         title: _("Change Mirror Mode");
         accelerator: "M <Shift>M";
@@ -37,9 +42,19 @@ Gtk.ShortcutsWindow _shortcuts {
         accelerator: "N <Shift>N";
       }
 
+      Gtk.ShortcutsShortcut {
+        title: _("Change Drawing Area X Offset");
+        accelerator: "X <Shift>X";
+      }
+
+      Gtk.ShortcutsShortcut {
+        title: _("Change Drawing Area Y Offset");
+        accelerator: "Y <Shift>Y";
+      }
+
       Gtk.ShortcutsShortcut {
         title: _("Change Drawing Direction");
-        accelerator: "O <Shift>O";
+        accelerator: "G <Shift>G";
       }
 
       Gtk.ShortcutsShortcut {

NickvisionCavalier.GNOME/Blueprints/window.blp

@@ -16,9 +16,23 @@ Adw.ApplicationWindow _root {
     [overlay]
     Adw.Bin _resizeBin {
       visible: false;
-      child: Gtk.Image {
-        icon-name: "org.nickvision.cavalier";
-        pixel-size: 128;
+      child: Gtk.Box {
+        orientation: vertical;
+        spacing: 12;
+        valign: center;
+
+        Gtk.Image {
+          icon-name: "org.nickvision.cavalier";
+          pixel-size: 128;
+        }
+
+        Adw.ButtonContent {
+          halign: center;
+          icon-name: "view-fullscreen-symbolic";
+          label: _("Resizing...");
+
+          styles ["dim-label", "title-3"]
+        }
       };
 
       styles [ "background" ]

NickvisionCavalier.GNOME/Program.cs

@@ -37,7 +37,10 @@ public Program(string[] args)
             @"* Added Cairo backend that can be used in case of problems with OpenGL. To activate, run the program with environment variable CAVALIER_RENDERER=cairo
               * All drawing modes except Splitter now have Circle variants
               * Added an easter egg (run the program with --help to find how to activate it)
+              * Added welcome screen that is shown on start until any sound gets detected
               * Fixed an issue where the app wasn't drawing correctly with >100% display scaling
+              * CAVA updated to 0.9.0
+              * Pipewire is now used as default input method, you can still change back to Pulse Audio using environment variable CAVALIER_INPUT_METHOD=pulse
               * 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/Resources/man-dancing.svg

@@ -5,6 +5,7 @@
   </gresource>
   <gresource prefix="/org/nickvision/cavalier/icons/scalable/status/">
     <file preprocess="xml-stripblanks">cross-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">man-dancing.svg</file>
     <file preprocess="xml-stripblanks">x-circular-symbolic.svg</file>
   </gresource>
 </gresources>

NickvisionCavalier.GNOME/Resources/org.nickvision.cavalier.gresource.xml

@@ -2,6 +2,7 @@
 using NickvisionCavalier.Shared.Controllers;
 using SkiaSharp;
 using System;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Timers;
 
@@ -28,6 +29,7 @@ public partial class DrawingView : Gtk.Stack, IDisposable
     private readonly GSourceFunc _showGl;
     private readonly GSourceFunc _queueRender;
     private readonly Timer _renderTimer;
+    private bool _showWelcome;
     private GRContext? _ctx;
     private SKImageInfo? _imgInfo;
     private SKSurface? _glSurface;
@@ -39,6 +41,7 @@ private DrawingView(Gtk.Builder builder, DrawingViewController controller) : bas
     {
         _disposed = false;
         _controller = controller;
+        _showWelcome = true;
         //Build UI
         builder.Connect(this);
         if (Environment.GetEnvironmentVariable("CAVALIER_RENDERER")?.ToLower() == "cairo")
@@ -62,9 +65,17 @@ private DrawingView(Gtk.Builder builder, DrawingViewController controller) : bas
         _controller.CAVA.OutputReceived += (sender, sample) =>
         {
             _sample = sample;
+            if (_showWelcome && sample.Any(s => s != 0))
+            {
+                _showWelcome = false;
+            }
             GLib.Functions.IdleAdd(0, () =>
             {
-                if (GetVisibleChildName() != (_useCairo ? "cairo" : "gl"))
+                if (_showWelcome && GetVisibleChildName() != "welcome")
+                {
+                    SetVisibleChildName("welcome");
+                }
+                if (!_showWelcome && GetVisibleChildName() != (_useCairo ? "cairo" : "gl"))
                 {
                     SetVisibleChildName(_useCairo ? "cairo" : "gl");
                 }