Merge pull request #406 from NickvisionApps/45

GNOME 45 Port
NickvisionApps · Nov 15, 2023 · 307ca9f · 307ca9f
2 parents 26fe015 + 5149c36
commit 307ca9f
Show file tree

Hide file tree

Showing 44 changed files with 6,557 additions and 6,958 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "3.1.0",
+      "version": "3.2.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.pull_request.user.login != 'weblate' }}
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-44
+      image: bilelmoussaoui/flatpak-github-actions:gnome-45
       options: --privileged
     strategy:
       matrix:
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.2
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
         with:
           bundle: org.nickvision.tagger.flatpak
           manifest-path: flatpak/org.nickvision.tagger.json

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -175,8 +175,8 @@ You may also make your changes via any code editor and use [`flatpak-builder`](h
 
 You may also build the app manually without using flatpak. List of dependencies:
 - dotnet >=7.0
-- GTK >=4.10
-- libadwaita >=1.2
+- GTK >=4.12
+- libadwaita >=1.4
 - [cake](https://cakebuild.net/) (build only)
     - `dotnet tool install --global Cake.Tool` or `dotnet tool restore` (in repository root folder)
 - blueprint-compiler, GTK and libadwaita development files (build only)

diff --git a/CakeScripts b/CakeScripts
diff --git a/NickvisionTagger.GNOME/Blueprints/album_art_info_dialog.blp b/NickvisionTagger.GNOME/Blueprints/album_art_info_dialog.blp
@@ -6,15 +6,14 @@ Adw.Window _root {
   modal: true;
   resizable: false;
 
-  content: Gtk.Box {
-    orientation: vertical;
-
+  content: Adw.ToolbarView {
+    [top]
     Adw.HeaderBar {
       title-widget: Gtk.Label {};
       styles ["flat"]
     }
 
-    Gtk.WindowHandle {
+    content: Gtk.WindowHandle {
       Gtk.Box {
         orientation: vertical;
         spacing: 24;
@@ -31,20 +30,26 @@ Adw.Window _root {
           Adw.ActionRow _mimeTypeRow {
             title: _("Mime Type");
             subtitle-selectable: true;
+
+            styles ["property"]
           }
 
           Adw.ActionRow _widthRow {
             title: _("Width");
             subtitle-selectable: true;
+
+            styles ["property"]
           }
 
           Adw.ActionRow _heightRow {
             title: _("Height");
             subtitle-selectable: true;
+
+            styles ["property"]
           }
         }
       }
-    }
+    };
   };
 
   Gtk.ShortcutController {

diff --git a/NickvisionTagger.GNOME/Blueprints/corrupted_files_dialog.blp b/NickvisionTagger.GNOME/Blueprints/corrupted_files_dialog.blp
@@ -6,9 +6,8 @@ Adw.Window _root {
   modal: true;
   resizable: false;
 
-  content: Gtk.Box {
-    orientation: vertical;
-
+  content: Adw.ToolbarView {
+    [top]
     Adw.HeaderBar {
       title-widget: Gtk.Label { };
 
@@ -23,7 +22,7 @@ Adw.Window _root {
       styles ["flat"]
     }
 
-    Gtk.WindowHandle {
+    content: Gtk.WindowHandle {
       Gtk.Box {
         orientation: vertical;
 
@@ -58,7 +57,7 @@ Adw.Window _root {
           styles ["view"]
         }
       }
-    }
+    };
   };
 
   Gtk.ShortcutController {

diff --git a/NickvisionTagger.GNOME/Blueprints/create_playlist_dialog.blp b/NickvisionTagger.GNOME/Blueprints/create_playlist_dialog.blp
@@ -8,9 +8,8 @@ Adw.Window _root {
   resizable: true;
   default-widget: _createButton;
 
-  content: Gtk.Box {
-    orientation: vertical;
-
+  content: Adw.ToolbarView {
+    [top]
     Adw.HeaderBar {
       title-widget: Gtk.Label { };
 
@@ -53,24 +52,12 @@ Adw.Window _root {
             };
           }
 
-          Adw.ActionRow {
+          Adw.SwitchRow _relativePathsRow {
             title: _("Use Relative Paths");
-            activatable-widget: _relativePathsSwitch;
-
-            [suffix]
-            Gtk.Switch _relativePathsSwitch {
-              valign: center;
-            }
           }
 
-          Adw.ActionRow {
+          Adw.SwitchRow _selectedFilesOnlyRow {
             title: _("Include Only Selected Files");
-            activatable-widget: _selectedFilesOnlySwitch;
-
-            [suffix]
-            Gtk.Switch _selectedFilesOnlySwitch {
-              valign: center;
-            }
           }
         }