Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GNOME 45 Port #406

Merged
merged 15 commits into from
Nov 15, 2023
Merged
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "3.1.0",
"version": "3.2.0",
"commands": [
"dotnet-cake"
]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion CakeScripts
Submodule CakeScripts updated 1 files
+3 −4 dotnet.cake
15 changes: 10 additions & 5 deletions NickvisionTagger.GNOME/Blueprints/album_art_info_dialog.blp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
9 changes: 4 additions & 5 deletions NickvisionTagger.GNOME/Blueprints/corrupted_files_dialog.blp
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand All @@ -23,7 +22,7 @@ Adw.Window _root {
styles ["flat"]
}

Gtk.WindowHandle {
content: Gtk.WindowHandle {
Gtk.Box {
orientation: vertical;

Expand Down Expand Up @@ -58,7 +57,7 @@ Adw.Window _root {
styles ["view"]
}
}
}
};
};

Gtk.ShortcutController {
Expand Down
21 changes: 4 additions & 17 deletions NickvisionTagger.GNOME/Blueprints/create_playlist_dialog.blp
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down Expand Up @@ -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;
}
}
}

Expand Down
Loading