From a5e13b7eae0c8f891a78c42ef26cd9073dd47ed3 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 20 Feb 2022 06:02:45 +0200 Subject: [PATCH 26/26] Ruledit: Set window icon See osdn #43553 Signed-off-by: Marko Lindqvist --- data/Makefile.am | 7 ++++--- data/freeciv-ruledit.png | Bin 0 -> 3652 bytes meson.build | 5 +++++ tools/ruledit/ruledit_qt.cpp | 6 ++++++ 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 data/freeciv-ruledit.png diff --git a/data/Makefile.am b/data/Makefile.am index 00e4862b37..f3f9d37df9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -55,6 +55,7 @@ pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES) EXTRA_DIST = \ freeciv-client.png \ + freeciv-ruledit.png \ gtk3_menus.xml \ gtk3.22_menus.xml \ gtk4_menus.xml \ @@ -100,14 +101,14 @@ endif if RULEDIT RULEDITDIRS = ruledit +ICONS = freeciv-ruledit.png else RULEDITDIRS = +ICONS = endif if CLIENT -ICONS = freeciv-client.png -else -ICONS = +ICONS += freeciv-client.png endif icondir = $(prefix)/share/pixmaps diff --git a/data/freeciv-ruledit.png b/data/freeciv-ruledit.png new file mode 100644 index 0000000000000000000000000000000000000000..d5aa12af54f53d3c75efe8faa4fa628457dfcb2e GIT binary patch literal 3652 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 + qapp_in->setWindowIcon(QIcon(*pm)); qapp = qapp_in; central = central_in; -- 2.34.1