Merge pull request #112 from NickvisionApps/next

Foreground image + transparency + fixes
NickvisionApps · Sep 11, 2023 · e3aa6df · e3aa6df
2 parents c00bad7 + fecd21b
commit e3aa6df
Show file tree

Hide file tree

Showing 31 changed files with 2,087 additions and 844 deletions.
diff --git a/NickvisionCavalier.GNOME/Blueprints/preferences_dialog.blp b/NickvisionCavalier.GNOME/Blueprints/preferences_dialog.blp
@@ -528,6 +528,7 @@ Adw.PreferencesWindow _root {
 
               Gtk.Button _addFgColorButton {
                 icon-name: "list-add-symbolic";
+                tooltip-text: _("Add foreground color");
 
                 styles [ "circular" ]
               }
@@ -549,6 +550,7 @@ Adw.PreferencesWindow _root {
 
               Gtk.Button _addBgColorButton {
                 icon-name: "list-add-symbolic";
+                tooltip-text: _("Add background color");
 
                 styles [ "circular" ]
               }
@@ -562,62 +564,109 @@ Adw.PreferencesWindow _root {
   }
 
   Adw.PreferencesPage {
-    title: _("Image");
+    title: _("Images");
     icon-name: "image-x-generic-symbolic";
 
     Gtk.Box {
       orientation: vertical;
+      margin-top: 12;
+      margin-start: 12;
+      margin-end: 12;
+      margin-bottom: 12;
+      spacing: 12;
 
       Gtk.Box {
-        spacing: 6;
+        Gtk.Box {
+          Gtk.ToggleButton _bgImgButton {
+            label: _("Background");
+            active: true;
+          }
 
-        Gtk.Button _addImageButton {
-          halign: start;
-          margin-top: 12;
-          margin-start: 12;
-          margin-end: 12;
-          margin-bottom: 6;
+          Gtk.ToggleButton {
+            label: _("Foreground");
+            active: bind _bgImgButton.active bidirectional inverted;
+          }
+
+          styles ["linked"]
+        }
 
+        Gtk.Separator {
+          hexpand: true;
+
+          styles ["spacer"]
+        }
+
+        Gtk.Button _addImageButton {
           Adw.ButtonContent {
             label: _("Add Image");
             icon-name: "list-add-symbolic";
           }
         }
+      }
 
-        Gtk.Separator {
-          styles [ "spacer" ]
+      Gtk.Box {
+        Gtk.Label {
+          hexpand: true;
+          halign: start;
+          margin-start: 12;
+          label: _("Scale");
         }
 
-        Gtk.Label {
+        Gtk.SpinButton _imgScaleSpin {
+          valign: center;
           margin-top: 6;
-          label: _("Scale");
+          margin-start: 6;
+          margin-end: 6;
+          margin-bottom: 6;
+          digits: 2;
+          adjustment: Gtk.Adjustment {
+            lower: 0.1;
+            upper: 1.0;
+            step-increment: 0.05;
+          };
         }
 
-        Gtk.Scale _imageScale {
+        Gtk.Separator {}
+
+        Gtk.Label {
           hexpand: true;
+          halign: start;
+          margin-start: 12;
+          label: _("Alpha");
+        }
+
+        Gtk.SpinButton _imgAlphaSpin {
+          valign: center;
           margin-top: 6;
+          margin-start: 6;
           margin-end: 6;
+          margin-bottom: 6;
+          digits: 2;
           adjustment: Gtk.Adjustment {
-            lower: 0.10;
+            lower: 0.1;
             upper: 1.0;
             step-increment: 0.05;
           };
         }
+
+        styles ["card"]
+      }
+
+      Gtk.Label {
+        label: _("Foreground image is only shown with Box drawing modes.");
+        visible: bind _bgImgButton.active inverted;
+
+        styles ["warning"]
       }
 
       Gtk.Stack _imagesStack
       {
-        margin-top: 6;
-        margin-start: 12;
-        margin-end: 12;
-        margin-bottom: 12;
-
         Gtk.StackPage {
           name: "empty";
           child: Adw.StatusPage {
             vexpand: true;
-            title: "No Images";
-            description: "Add an image to use it in Cavalier.";
+            title: _("No Images");
+            description: _("Add an image to use it in Cavalier.");
             icon-name: "image-x-generic-symbolic";
           };
         }
@@ -630,10 +679,6 @@ Adw.PreferencesWindow _root {
 
             Gtk.FlowBox _imagesFlowBox {
               valign: start;
-              margin-top: 6;
-              margin-start: 6;
-              margin-end: 6;
-              margin-bottom: 6;
               homogeneous: true;
               min-children-per-line: 3;
 

diff --git a/NickvisionCavalier.GNOME/Blueprints/shortcuts_dialog.blp b/NickvisionCavalier.GNOME/Blueprints/shortcuts_dialog.blp
@@ -117,12 +117,32 @@ Gtk.ShortcutsWindow _shortcuts {
 
       Gtk.ShortcutsShortcut {
         title: _("Change Background Image");
-        accelerator: "I <Shift>I";
+        accelerator: "1 <Shift>1";
       }
 
       Gtk.ShortcutsShortcut {
-        title: _("Change Image Scale");
-        accelerator: "A <Shift>A";
+        title: _("Change Background Image Scale");
+        accelerator: "2 <Shift>2";
+      }
+
+      Gtk.ShortcutsShortcut {
+        title: _("Change Background Image Alpha");
+        accelerator: "3 <Shift>3";
+      }
+
+      Gtk.ShortcutsShortcut {
+        title: _("Change Foreground Image");
+        accelerator: "4 <Shift>4";
+      }
+
+      Gtk.ShortcutsShortcut {
+        title: _("Change Foreground Image Scale");
+        accelerator: "5 <Shift>5";
+      }
+
+      Gtk.ShortcutsShortcut {
+        title: _("Change Foreground Image Alpha");
+        accelerator: "6 <Shift>6";
       }
     }
 

diff --git a/NickvisionCavalier.GNOME/NickvisionCavalier.GNOME.csproj b/NickvisionCavalier.GNOME/NickvisionCavalier.GNOME.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="GirCore.Adw-1" Version="0.4.0" />
-    <PackageReference Include="Nickvision.Aura" Version="2023.8.2" />
+    <PackageReference Include="Nickvision.Aura" Version="2023.9.3" />
     <PackageReference Include="Nickvision.GirExt" Version="2023.7.2" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.3" />
   </ItemGroup>

diff --git a/NickvisionCavalier.GNOME/Program.cs b/NickvisionCavalier.GNOME/Program.cs
@@ -34,7 +34,10 @@ public Program(string[] args)
         _mainWindow = null;
         _mainWindowController = new MainWindowController(args);
         _mainWindowController.AppInfo.Changelog =
-            @"* Updated translations (Thanks everyone on Weblate!)";
+            @"* Added ability to set foreground image for Box modes
+              * Transparency can now be set both for background and foreground image
+              * Cavalier switched back to using PulseAudio by default. You can still switch audio backend to whatever is supported by CAVA using CAVALIER_INPUT_METHOD environment variable
+              * Updated translations (Thanks everyone on Weblate!)";
         _application.OnActivate += OnActivate;
         if (File.Exists(Path.GetFullPath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)) + "/org.nickvision.cavalier.gresource"))
         {