Regen installer icons, add About logo fallback

.github/workflows/flatpak-build.yml

@@ -25,15 +25,6 @@ jobs:
         with:
           submodules: true
 
-      - name: Install ImageMagick
-        run: |
-          apt-get update
-          apt-get install -y --no-install-recommends imagemagick
-          if ! command -v magick >/dev/null 2>&1 && command -v convert >/dev/null 2>&1; then
-            printf '%s\n' '#!/bin/sh' 'exec convert "$@"' > /usr/local/bin/magick
-            chmod +x /usr/local/bin/magick
-          fi
-
       - name: Build Flatpak
         id: flatpak_builder
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6

data/icons/generate_icons.py

@@ -106,7 +106,6 @@ def parse_args():
 
 def main():
     args = parse_args()
-    magick_cmd()
     svg = pathlib.Path(args.input_svg)
     out_png = pathlib.Path(args.output_png)
     out_png.parent.mkdir(parents=True, exist_ok=True)

data/icons/meson.build

@@ -1,5 +1,5 @@
 icon_gen = find_program('generate_icons.py')
-find_program('magick', required: true)
+find_program('magick', required: host_machine.system() == 'windows')
 
 icondir = join_paths(get_option('datadir'), 'icons/hicolor')
 custom_target('zoitechat_png',

src/fe-gtk/fe-gtk.vcxproj

@@ -42,6 +42,7 @@ SET SOLUTIONDIR=$(SolutionDir)..\
 powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\src\fe-gtk\zoitechat.rc.tt" "$(ZoiteChatLib)zoitechat.rc.utf8"
 REM zoitechat.rc needs to be in UCS-2 or Resource Compiler will complain
 powershell "Get-Content -Encoding UTF8 '$(ZoiteChatLib)zoitechat.rc.utf8' | Out-File '$(ZoiteChatLib)zoitechat.rc'; Remove-Item '$(ZoiteChatLib)zoitechat.rc.utf8'"
+"$(Python3Path)\python.exe" "$(SolutionDir)..\data\icons\generate_icons.py" "$(DataDir)icons\zoitechat.svg" "$(DataDir)icons\zoitechat.png" --size 256 --ico "$(DataDir)icons\zoitechat.ico"
 "$(DepsRoot)\bin\glib-compile-resources.exe" --generate-header --manual-register --sourcedir "$(DataDir)" --target "$(ZoiteChatLib)resources.h" "$(DataDir)zoitechat.gresource.xml"
 "$(DepsRoot)\bin\glib-compile-resources.exe" --generate-source --manual-register --sourcedir "$(DataDir)" --target "$(ZoiteChatLib)resources.c" "$(DataDir)zoitechat.gresource.xml"
       ]]></Command>

src/fe-gtk/menu.c

@@ -1920,7 +1920,10 @@ menu_about (GtkWidget *wid, gpointer sess)
 	about_logo = gdk_pixbuf_new_from_resource_at_scale ("/icons/zoitechat.svg", 48, 48, TRUE, NULL);
 	if (!about_logo && pix_zoitechat)
 		about_logo = gdk_pixbuf_scale_simple (pix_zoitechat, 48, 48, GDK_INTERP_BILINEAR);
-	gtk_about_dialog_set_logo (dialog, about_logo ? about_logo : pix_zoitechat);
+	if (about_logo || pix_zoitechat)
+		gtk_about_dialog_set_logo (dialog, about_logo ? about_logo : pix_zoitechat);
+	else
+		gtk_about_dialog_set_logo_icon_name (dialog, "zoitechat");
 	if (about_logo)
 		g_object_unref (about_logo);
 	gtk_about_dialog_set_copyright (dialog, "\302\251 1998-2010 Peter \305\275elezn\303\275\n\302\251 2009-2014 Berke Viktor\n\302\251 2015-2025 Patrick Griffis\n\302\251 2026 deepend");

src/fe-gtk/meson.build

@@ -117,8 +117,6 @@ if get_option('plugin')
   zoitechat_gtk_sources += 'plugingui.c'
 endif
 
-find_program('magick', required: true)
-
 zoitechat_png_generated = custom_target('zoitechat_resource_png',
   input: '../../data/icons/zoitechat.svg',
   output: 'zoitechat.png',

win32/installer/installer.vcxproj

@@ -40,6 +40,7 @@
 SET SOLUTIONDIR=$(SolutionDir)..\
 if not exist "$(ZoiteChatBin)" mkdir "$(ZoiteChatBin)"
 powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\installer\zoitechat.iss.tt" "$(ZoiteChatBin)zoitechat.iss"
+"$(Python3Path)\python.exe" "$(SolutionDir)..\data\icons\generate_icons.py" "$(DataDir)icons\zoitechat.svg" "$(DataDir)icons\zoitechat.png" --size 256 --ico "$(DataDir)icons\zoitechat.ico"
 $(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(ZoiteChatBin)zoitechat.iss"
       ]]>
       </Command>