Skip to content
Snippets Groups Projects
Commit 6e908375 authored by Michel Le Bihan's avatar Michel Le Bihan Committed by Philipp Hörist
Browse files

Add target-based icon assets

parent 18e36aa7
No related branches found
No related tags found
No related merge requests found
Pipeline #13077 passed
......@@ -319,11 +319,16 @@ function makeappx {
"$(find /c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/*/x64/ -name makeappx.exe -print -quit)" "$@"
}
function makepri {
"$(find /c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/*/x64/ -name makepri.exe -print -quit)" "$@"
}
function build_installer {
MSYSTEM='MINGW64' /usr/bin/bash -lc "cd ${BUILD_ROOT} && makensis -NOCD -DVERSION=\"$QL_VERSION_DESC\" -DARCH=\"${MSYSTEM_CARCH}\" -DPREFIX=\"${MSYSTEM_PREFIX:1}\" ${MISC}/gajim.nsi"
MSYSTEM='MINGW64' /usr/bin/bash -lc "cd ${BUILD_ROOT} && makensis -NOCD -DVERSION=\"$QL_VERSION_DESC\" -DARCH=\"${MSYSTEM_CARCH}\" -DPREFIX=\"${MSYSTEM_PREFIX:1}\" ${MISC}/gajim-portable.nsi"
(
cd ${BUILD_ROOT}
rm -rf assets bundle filemapping.txt assets.resfiles appxmanifest.xml resources.pri
echo "[Files]" > filemapping.txt
find ${MSYSTEM_PREFIX:1} -type f | while read line; do
echo "\"$line\" \"${line/${MSYSTEM_PREFIX:1}\///}\"" >> filemapping.txt
......@@ -331,9 +336,22 @@ function build_installer {
mkdir -p assets bundle
# https://learn.microsoft.com/en-us/windows/apps/design/style/iconography/app-icon-construction
for size in {44,50,150}; do
rsvg-convert -w ${size} -h ${size} -o assets/gajim${size}x${size}.png ${DIR}/../gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg
echo "\"assets/gajim${size}x${size}.png\" \"assets/gajim${size}x${size}.png\"" >> filemapping.txt
for scale in {100,125,150,200,400}; do
scaled_size=$(( (${size}*${scale}+100/2)/100 ))
rsvg-convert -w ${scaled_size} -h ${scaled_size} -o assets/gajim${size}x${size}.scale-${scale}.png ${DIR}/../gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg
echo "\"assets/gajim${size}x${size}.scale-${scale}.png\" \"assets/gajim${size}x${size}.scale-${scale}.png\"" >> filemapping.txt
done
done
for size in {16,24,32,48,256}; do
rsvg-convert -w ${size} -h ${size} -o assets/gajim44x44.targetsize-${size}.png ${DIR}/../gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg
cp assets/gajim44x44.targetsize-${size}.png assets/gajim44x44.targetsize-${size}_altform-unplated.png
cp assets/gajim44x44.targetsize-${size}.png assets/gajim44x44.targetsize-${size}_altform-lightunplated.png
echo "\"assets/gajim44x44.targetsize-${size}.png\" \"assets/gajim44x44.targetsize-${size}.png\"" >> filemapping.txt
echo "\"assets/gajim44x44.targetsize-${size}_altform-unplated.png\" \"assets/gajim44x44.targetsize-${size}_altform-unplated.png\"" >> filemapping.txt
echo "\"assets/gajim44x44.targetsize-${size}_altform-lightunplated.png\" \"assets/gajim44x44.targetsize-${size}_altform-lightunplated.png\"" >> filemapping.txt
done
makepri new -pr . -cf ${MISC}/priconfig.xml -mn ${MISC}/appxmanifest.xml -of resources.pri -o
echo "\"resources.pri\" \"resources.pri\"" >> filemapping.txt
sed "s/QL_VERSION_DESC/${QL_VERSION_DESC}.0/" ${MISC}/appxmanifest.xml > AppxManifest.xml
echo "\"AppxManifest.xml\" \"AppxManifest.xml\"" >> filemapping.txt
makeappx pack -f filemapping.txt -p bundle/Gajim_x64.msix -o
......
......@@ -13,7 +13,7 @@
<DisplayName>Gajim</DisplayName>
<PublisherDisplayName>Gajim</PublisherDisplayName>
<Description>A fully-featured XMPP client</Description>
<Logo>assets\gajim50x50.png</Logo>
<Logo>gajim50x50.png</Logo>
</Properties>
<Resources>
<Resource Language="en-us" />
......@@ -29,8 +29,8 @@
<uap:VisualElements
BackgroundColor="transparent"
DisplayName="Gajim"
Square44x44Logo="assets\gajim44x44.png"
Square150x150Logo="assets\gajim150x150.png"
Square44x44Logo="gajim44x44.png"
Square150x150Logo="gajim150x150.png"
Description="Gajim">
</uap:VisualElements>
<Extensions>
......
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<resources targetOsVersion="10.0.0" majorVersion="1">
<index root="\" startIndexAt="\assets">
<default>
<qualifier name="Language" value="en-US"/>
<qualifier name="Contrast" value="standard"/>
<qualifier name="Scale" value="100"/>
<qualifier name="HomeRegion" value="001"/>
<qualifier name="TargetSize" value="256"/>
<qualifier name="LayoutDirection" value="LTR"/>
<qualifier name="Theme" value="dark"/>
<qualifier name="AlternateForm" value=""/>
<qualifier name="DXFeatureLevel" value="DX9"/>
<qualifier name="Configuration" value=""/>
<qualifier name="DeviceFamily" value="Universal"/>
<qualifier name="Custom" value=""/>
</default>
<indexer-config type="folder" foldernameAsQualifier="true" filenameAsQualifier="true" qualifierDelimiter="."/>
</index>
<!--<index startIndexAt="Start Index Here" root="Root Here">-->
<!-- <indexer-config type="resfiles" qualifierDelimiter="."/>-->
<!-- <indexer-config type="priinfo" emitStrings="true" emitPaths="true" emitEmbeddedData="true"/>-->
<!--</index>-->
</resources>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment