From 764aac86faf3fee869f72a8750cf8b95dfb36007 Mon Sep 17 00:00:00 2001 From: mrbesen Date: Wed, 21 Feb 2024 16:17:17 +0100 Subject: [PATCH 1/4] add windows icon --- .gitignore | 2 ++ Makefile | 1 + resources.rc | 1 + 3 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 20eb0dd..a9a6f21 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ debian/cnping debian/cnping.substvars debian/debhelper-build-stamp debian/files + +cnping.ico diff --git a/Makefile b/Makefile index 8f90785..79d88ba 100644 --- a/Makefile +++ b/Makefile @@ -76,4 +76,5 @@ updateicons : ${ICONSPATH}scalable/apps/${APPNAME}.svg convert $^ -resize 48x48 ${ICONSPATH}48x48/apps/${APPNAME}.png convert $^ -resize 256x256 ${ICONSPATH}256x256/apps/${APPNAME}.png convert $^ -resize 1024x1024 ${ICONSPATH}1024x1024/apps/${APPNAME}.png + convert $^ -density 300 -define icon:auto-resize=256,128,96,64,48,32,16 -background none cnping.ico diff --git a/resources.rc b/resources.rc index b0c72c6..8c75e44 100644 --- a/resources.rc +++ b/resources.rc @@ -22,3 +22,4 @@ BEGIN PUSHBUTTON "&Close", 8, 175, 80, 100, 10 END +MAIN_ICON ICON "cnping.ico" From 07572457a98bb4179fbbb43d85aac5ef47aa319c Mon Sep 17 00:00:00 2001 From: mrbesen Date: Thu, 22 Feb 2024 10:21:55 +0100 Subject: [PATCH 2/4] fix ci; reduce amount of resolutions --- .github/workflows/build.yml | 1 + Makefile | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 896d97b..02ed9c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,7 @@ jobs: g++-mingw-w64-i686 \ devscripts \ appstream \ + imagemagick \ desktop-file-utils - name: Build diff --git a/Makefile b/Makefile index 79d88ba..5305e95 100644 --- a/Makefile +++ b/Makefile @@ -76,5 +76,7 @@ updateicons : ${ICONSPATH}scalable/apps/${APPNAME}.svg convert $^ -resize 48x48 ${ICONSPATH}48x48/apps/${APPNAME}.png convert $^ -resize 256x256 ${ICONSPATH}256x256/apps/${APPNAME}.png convert $^ -resize 1024x1024 ${ICONSPATH}1024x1024/apps/${APPNAME}.png - convert $^ -density 300 -define icon:auto-resize=256,128,96,64,48,32,16 -background none cnping.ico + +cnping.ico: ${ICONSPATH}scalable/apps/${APPNAME}.svg + convert $^ -density 300 -define icon:auto-resize=128,32 -background none $@ From 79872601287ae0e0b7bd1fadb0b74aa166d14caa Mon Sep 17 00:00:00 2001 From: mrbesen Date: Fri, 23 Feb 2024 10:06:23 +0100 Subject: [PATCH 3/4] add cnping.ico to artifacts --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02ed9c6..b8d3c0a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,12 @@ jobs: with: name: cnping-exe path: "*.exe" - + + - uses: actions/upload-artifact@v4 + with: + name: cnping-icon + path: "cnping.ico" + - name: Build deb run: debuild --no-sign From 1803de660ea0da91e61df2419e7823e67f2de804 Mon Sep 17 00:00:00 2001 From: mrbesen Date: Fri, 23 Feb 2024 13:43:49 +0100 Subject: [PATCH 4/4] use gimp to compress the icon --- .github/workflows/build.yml | 5 ----- .gitignore | 2 -- Makefile | 10 +++++++++- cnping.ico | Bin 0 -> 1655 bytes 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 cnping.ico diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8d3c0a..d7c0d3d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,11 +41,6 @@ jobs: name: cnping-exe path: "*.exe" - - uses: actions/upload-artifact@v4 - with: - name: cnping-icon - path: "cnping.ico" - - name: Build deb run: debuild --no-sign diff --git a/.gitignore b/.gitignore index a9a6f21..20eb0dd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,3 @@ debian/cnping debian/cnping.substvars debian/debhelper-build-stamp debian/files - -cnping.ico diff --git a/Makefile b/Makefile index 5305e95..97be216 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,14 @@ updateicons : ${ICONSPATH}scalable/apps/${APPNAME}.svg convert $^ -resize 256x256 ${ICONSPATH}256x256/apps/${APPNAME}.png convert $^ -resize 1024x1024 ${ICONSPATH}1024x1024/apps/${APPNAME}.png +# after creating the ico file use GIMP to compress it: +# Image-> Mode -> Indexed... +# Choose "Generate optimum palette" +# Maximum number of colors: 3 (may change if the icon changes) +# "Convert" +# File -> Export As +# Check "Compressed (PNG)" in every resolution +# "Export" cnping.ico: ${ICONSPATH}scalable/apps/${APPNAME}.svg - convert $^ -density 300 -define icon:auto-resize=128,32 -background none $@ + convert $^ -density 300 -define icon:auto-resize=256,64,16 -background none $@ diff --git a/cnping.ico b/cnping.ico new file mode 100644 index 0000000000000000000000000000000000000000..3ecf7c336971fcb90346ffe65b089cac8c5191ce GIT binary patch literal 1655 zcmZQzU}RusU|aWjYN=RpF*NkUkx$7V%i|b4V5XOt5V}BjH`|tC# z;yrWUmdMy1T5q%ad*R#nIh8NX9(?~(dX;_uZu`^qi`{=rP5*AU?(f{4Ob#;`@F14A z{L3#Y7cg(H=o5d>#IXK6C&QsN%=b?kuV+3yv-E*=<+IWRi(=LW14g{)^#OrrEDVX) z8s8tWGFX4W>ciX!_Gh9y2w3hgqcnk|n5n_w^?~vv*%{#pvOoORFn{KXVN~#8z=zIQ z8MIh3;_()lQa7@`FxcG7`@eIB+3TbK3Z!gL9iFrQeVJ9C+|!jD4i~mW{;ybiT9n}s z%Rr;B`=77BkZijl@7E1V25dY}fuYYt2(7-zd|k`;B@7@=NFwBk_jgQeCd;97vN3pfXjqcnT7X&1%xTIOql7&*JL2z+Wj!(-JU*`xC3j|4H{qXcpSDYk267M z=EU^5|I18$e^zELXEtjuIjw2HZpGkR!T7eM;Jtqycl@s7$1Ufb*G`?cdanPAbMBv= ze96s!-x3{(EzRtO+dw;>qxaR8X4e<=?8BJC(USyo~FmzwF@3zWGmcCEE%%oh%1m-yZgEDS_S(?hZ^Z7)*p5*cWi> zCwz@f(ASxpZr`JKH*Kr+fz_$&!y3dvauXS>7Z2l+H+XK@H5|!dyz