Compare commits

...

5 Commits

Author SHA1 Message Date
kramo
5306b7c81c Update copyright dates 2024-03-20 15:15:36 +01:00
kramo
c5675efa48 v2.8 2024-03-20 15:05:49 +01:00
kramo
83399c7882 Remove incorrect shortcut from hidden search entry 2024-03-20 15:05:07 +01:00
kramo
04900c7acf Temporarily disable Windows CI 2024-03-20 14:58:32 +01:00
kramo
3ae6b40773 Merge pull request #228 from kra-mo/libadwaita-1.5
Port to Libadwaita 1.5 widgets
2024-03-20 14:48:09 +01:00
6 changed files with 39 additions and 44 deletions

View File

@@ -22,39 +22,39 @@ jobs:
bundle: hu.kramo.Cartridges.Devel.flatpak bundle: hu.kramo.Cartridges.Devel.flatpak
manifest-path: flatpak/hu.kramo.Cartridges.Devel.json manifest-path: flatpak/hu.kramo.Cartridges.Devel.json
windows: # windows:
name: Windows # name: Windows
runs-on: windows-latest # runs-on: windows-latest
steps: # steps:
- name: Checkout # - name: Checkout
uses: actions/checkout@v4 # uses: actions/checkout@v4
- name: Setup MSYS2 # - name: Setup MSYS2
uses: msys2/setup-msys2@v2 # uses: msys2/setup-msys2@v2
with: # with:
msystem: UCRT64 # msystem: UCRT64
update: true # update: true
install: mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-libadwaita mingw-w64-ucrt-x86_64-python-gobject mingw-w64-ucrt-x86_64-python-yaml mingw-w64-ucrt-x86_64-python-requests mingw-w64-ucrt-x86_64-python-pillow mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-ca-certificates mingw-w64-ucrt-x86_64-meson git # install: mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-libadwaita mingw-w64-ucrt-x86_64-python-gobject mingw-w64-ucrt-x86_64-python-yaml mingw-w64-ucrt-x86_64-python-requests mingw-w64-ucrt-x86_64-python-pillow mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-ca-certificates mingw-w64-ucrt-x86_64-meson git
- name: Compile # - name: Compile
shell: msys2 {0} # shell: msys2 {0}
run: | # run: |
meson setup _build # meson setup _build
ninja -C _build install # ninja -C _build install
pacman --noconfirm -Rs mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-meson git # pacman --noconfirm -Rs mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-meson git
find /ucrt64/share/locale/ -type f ! -name "*cartridges.mo" -delete # find /ucrt64/share/locale/ -type f ! -name "*cartridges.mo" -delete
- name: Test # - name: Test
shell: msys2 {0} # shell: msys2 {0}
run: | # run: |
set +e # set +e
timeout 2 cartridges; [ "$?" -eq "124" ] # timeout 2 cartridges; [ "$?" -eq "124" ]
- name: Inno Setup # - name: Inno Setup
run: iscc ".\_build\windows\Cartridges.iss" # run: iscc ".\_build\windows\Cartridges.iss"
- name: Upload Artifact # - name: Upload Artifact
uses: actions/upload-artifact@v3 # uses: actions/upload-artifact@v3
with: # with:
name: Windows Installer # name: Windows Installer
path: _build/windows/Output/Cartridges Setup.exe # path: _build/windows/Output/Cartridges Setup.exe

View File

@@ -39,7 +39,7 @@ jobs:
- name: Publish release - name: Publish release
uses: softprops/action-gh-release@v0.1.15 uses: softprops/action-gh-release@v0.1.15
with: with:
files: Windows Installer/Cartridges Setup.exe # files: Windows Installer/Cartridges Setup.exe
fail_on_unmatched_files: true # fail_on_unmatched_files: true
tag_name: ${{ steps.get_tag_name.outputs.tag_name }} tag_name: ${{ steps.get_tag_name.outputs.tag_name }}
body_path: release_notes body_path: release_notes

View File

@@ -1,6 +1,6 @@
# main.py # main.py
# #
# Copyright 2022-2023 kramo # Copyright 2022-2024 kramo
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -262,7 +262,7 @@ class CartridgesApplication(Adw.Application):
) )
) )
about.set_designers(("kramo https://kramo.page",)) about.set_designers(("kramo https://kramo.page",))
about.set_copyright("© 2022-2023 kramo") about.set_copyright("© 2022-2024 kramo")
# Translators: Replace this with your name for it to show up in the about window # Translators: Replace this with your name for it to show up in the about window
about.set_translator_credits = (_("translator_credits"),) about.set_translator_credits = (_("translator_credits"),)
about.set_debug_info(debug_str) about.set_debug_info(debug_str)

View File

@@ -268,11 +268,6 @@ Adw.NavigationPage hidden_library_page {
SearchEntry hidden_search_entry { SearchEntry hidden_search_entry {
placeholder-text: _("Search"); placeholder-text: _("Search");
hexpand: true; hexpand: true;
Shortcut {
trigger: "Escape";
action: "action(win.toggle_search)";
}
} }
} }
} }

View File

@@ -53,10 +53,10 @@
</screenshots> </screenshots>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="2.7.4" date="2024-03-06"> <release version="2.8" date="2024-03-20">
<description translatable="no"> <description translatable="no">
<ul> <ul>
<li>Updated the app's metadata</li> <li>The app features new adaptive widgets taking advantage of developments in GNOME 46</li>
</ul> </ul>
</description> </description>
</release> </release>

View File

@@ -1,5 +1,5 @@
project('cartridges', project('cartridges',
version: '2.7.4', version: '2.8',
meson_version: '>= 0.59.0', meson_version: '>= 0.59.0',
default_options: [ 'warning_level=2', 'werror=false', ], default_options: [ 'warning_level=2', 'werror=false', ],
) )