Skip to content

Commit

Permalink
new backgrounds, test workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zekiu
Zekiu committed Jan 15, 2025
1 parent 55fe57d commit e4b70da
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 19 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/trigger_release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ jobs:
echo "VERSION=$tag_name" >> $GITHUB_ENV
- name: Package artifacts properly
run: |
mv ${{ github.workspace }}/FjordLauncher-source FjordLauncher-${{ env.VERSION }}
mv FjordLauncher-Linux-Qt6-Portable*/FjordLauncher-portable.tar.gz FjordLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
mv ${{ github.workspace }}/FjordLauncher-source FjordLauncher
mv FjordLauncher-Linux-Qt6-Portable*/FjordLauncher-portable.tar.gz FjordLauncher-Linux-Qt6-Portable.tar.gz
mv FjordLauncher-*.AppImage/FjordLauncher-*.AppImage FjordLauncher-Linux-x86_64.AppImage
mv FjordLauncher-*.AppImage.zsync/FjordLauncher-*.AppImage.zsync FjordLauncher-Linux-x86_64.AppImage.zsync
tar --exclude='.git' -czf FjordLauncher-${{ env.VERSION }}.tar.gz FjordLauncher-${{ env.VERSION }}
tar --exclude='.git' -czf FjordLauncher.tar.gz FjordLauncher
for d in FjordLauncher-Windows-MSVC*; do
cd "${d}" || continue
Expand All @@ -55,8 +55,8 @@ jobs:
test -z "${LEGACY}" || NAME="${NAME}-Legacy"
test -z "${ARM64}" || NAME="${NAME}-arm64"
test -z "${PORT}" || NAME="${NAME}-Portable"
test -z "${INST}" || mv FjordLauncher-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
test -z "${INST}" || mv FjordLauncher-*.exe ../${NAME}-Setup.exe
test -n "${INST}" || zip -r -9 "../${NAME}.zip" *
cd ..
done
Expand All @@ -66,8 +66,8 @@ jobs:
PORT="$(echo -n ${d} | grep -o Portable || true)"
NAME="FjordLauncher-Windows-MinGW-w64"
test -z "${PORT}" || NAME="${NAME}-Portable"
test -z "${INST}" || mv FjordLauncher-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
test -z "${INST}" || mv FjordLauncher-*.exe ../${NAME}-Setup.exe
test -n "${INST}" || zip -r -9 "../${NAME}.zip" *
cd ..
done
Expand All @@ -83,14 +83,14 @@ jobs:
files: |
FjordLauncher-Linux-x86_64.AppImage
FjordLauncher-Linux-x86_64.AppImage.zsync
FjordLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
FjordLauncher-Windows-MinGW-w64-${{ env.VERSION }}.zip
FjordLauncher-Windows-MinGW-w64-Portable-${{ env.VERSION }}.zip
FjordLauncher-Windows-MinGW-w64-Setup-${{ env.VERSION }}.exe
FjordLauncher-Windows-MSVC-arm64-${{ env.VERSION }}.zip
FjordLauncher-Windows-MSVC-arm64-Portable-${{ env.VERSION }}.zip
FjordLauncher-Windows-MSVC-arm64-Setup-${{ env.VERSION }}.exe
FjordLauncher-Windows-MSVC-${{ env.VERSION }}.zip
FjordLauncher-Windows-MSVC-Portable-${{ env.VERSION }}.zip
FjordLauncher-Windows-MSVC-Setup-${{ env.VERSION }}.exe
FjordLauncher-${{ env.VERSION }}.tar.gz
FjordLauncher-Linux-Qt6-Portable.tar.gz
FjordLauncher-Windows-MinGW-w64.zip
FjordLauncher-Windows-MinGW-w64-Portable.zip
FjordLauncher-Windows-MinGW-w64-Setup.exe
FjordLauncher-Windows-MSVC-arm64.zip
FjordLauncher-Windows-MSVC-arm64-Portable.zip
FjordLauncher-Windows-MSVC-arm64-Setup.exe
FjordLauncher-Windows-MSVC.zip
FjordLauncher-Windows-MSVC-Portable.zip
FjordLauncher-Windows-MSVC-Setup.exe
FjordLauncher.tar.gz
20 changes: 20 additions & 0 deletions launcher/resources/backgrounds/backgrounds.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,25 @@
<file alias="wino-xmas">wino.png</file>
<file alias="wino-bday">wino.png</file>
<file alias="wino-spooky">wino.png</file>
<!-- skolim -->
<file alias="skolim">skolim.png</file>
<file alias="skolim-xmas">skolim.png</file>
<file alias="skolim-bday">skolim.png</file>
<file alias="skolim-spooky">skolim.png</file>
<!-- dzastin1 -->
<file alias="dzastin1">dzastin1.png</file>
<file alias="dzastin1-xmas">dzastin1.png</file>
<file alias="dzastin1-bday">dzastin1.png</file>
<file alias="dzastin1-spooky">dzastin1.png</file>
<!-- dzastin2 -->
<file alias="dzastin2">dzastin2.png</file>
<file alias="dzastin2-xmas">dzastin2.png</file>
<file alias="dzastin2-bday">dzastin2.png</file>
<file alias="dzastin2-spooky">dzastin2.png</file>
<!-- dzastin3 -->
<file alias="dzastin3">dzastin3.png</file>
<file alias="dzastin3-xmas">dzastin3.png</file>
<file alias="dzastin3-bday">dzastin3.png</file>
<file alias="dzastin3-spooky">dzastin3.png</file>
</qresource>
</RCC>
Binary file added launcher/resources/backgrounds/dzastin1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/resources/backgrounds/dzastin2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/resources/backgrounds/dzastin3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/resources/backgrounds/skolim.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion launcher/ui/themes/ThemeManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,11 @@ void ThemeManager::initializeCatPacks()
{
QList<std::pair<QString, QString>> defaultCats{ { "wlod", QObject::tr("Włodzimierz the Cat (kot selnov)") },
{ "piwo", QObject::tr("Piwo Piwo Piwo Piwo") },
{ "wino", QObject::tr("Wino kot") } };
{ "wino", QObject::tr("Wino kot") },
{ "skolim", QObject::tr("Skolim Latino") },
{ "dzastin1", QObject::tr("Dżastin RIP 😭") },
{ "dzastin2", QObject::tr("Dżastin RIP 😭😭") },
{ "dzastin3", QObject::tr("Dżastin RIP 😭😭😭") } };
for (auto [id, name] : defaultCats) {
addCatPack(std::unique_ptr<CatPack>(new BasicCatPack(id, name)));
}
Expand Down

0 comments on commit e4b70da

Please sign in to comment.