From baba0e0f34e2a53775a0473a22b6bb1da6769310 Mon Sep 17 00:00:00 2001 From: RigoLigo Date: Mon, 30 May 2022 17:21:31 +0800 Subject: [PATCH] Move icons into platform specific directory --- RedPandaIDE/RedPandaIDE.pro | 7 +++---- {RedPandaIDE/images => macos}/RedPandaIDE.icns | Bin {RedPandaIDE/images => macos}/gen_macos_icns.sh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) rename {RedPandaIDE/images => macos}/RedPandaIDE.icns (100%) rename {RedPandaIDE/images => macos}/gen_macos_icns.sh (93%) diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index cf45795c..c2966b67 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -20,7 +20,7 @@ macos: { QT += gui-private - ICON = images/RedPandaIDE.icns + ICON = ../macos/RedPandaIDE.icns } win32: VERSION = $${APP_VERSION}.0 @@ -503,15 +503,14 @@ RESOURCES += theme_files RESOURCES += colorscheme_files macos: { - message($$OUT_PWD/astyle/astyle) - # Add needed executables into the main app bundle bundled_executable.files = \ $$OUT_PWD/../astyle/astyle \ $$OUT_PWD/../consolepauser/consolepauser \ $$OUT_PWD/../redpanda-git-askpass/redpanda-git-askpass.app/Contents/MacOS/redpanda-git-askpass - bundled_executable.path = Contents/MacOS + # Also bundled templates + QMAKE_BUNDLE_DATA += bundled_executable } diff --git a/RedPandaIDE/images/RedPandaIDE.icns b/macos/RedPandaIDE.icns similarity index 100% rename from RedPandaIDE/images/RedPandaIDE.icns rename to macos/RedPandaIDE.icns diff --git a/RedPandaIDE/images/gen_macos_icns.sh b/macos/gen_macos_icns.sh similarity index 93% rename from RedPandaIDE/images/gen_macos_icns.sh rename to macos/gen_macos_icns.sh index 93760dfb..0ad45aa2 100755 --- a/RedPandaIDE/images/gen_macos_icns.sh +++ b/macos/gen_macos_icns.sh @@ -1,6 +1,6 @@ #!/bin/bash -input_icon="devcpp.png" +input_icon="../RedPandaIDE/images/devcpp.png" output_dir="RedPandaIDE.iconset" mkdir $output_dir