From 72ed2fa81915bb0e95ac5e9038a0d0a37f9491f5 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 5 Jun 2024 16:01:52 +0200 Subject: [PATCH] Move app logo to main executable Moves more branding information out of the plugins. Change-Id: I71575f268dd8f2860f4da56101b0e3d9442df367 Reviewed-by: Reviewed-by: Alessandro Portale (cherry picked from commit 68bc2136444f4b940a142c9a650a69c15d496c02) Reviewed-by: Tim Jenssen --- cmake/QtCreatorIDEBranding.cmake | 2 +- src/app/CMakeLists.txt | 15 +++++++++++++++ src/app/app.qbs | 1 + .../core_logo.qrc => app/app_logo.qrc} | 0 .../app_logo.qrc.cmakein} | 0 .../images/logo/128/QtProject-qtcreator.png | Bin .../images/logo/16/QtProject-qtcreator.png | Bin .../images/logo/24/QtProject-qtcreator.png | Bin .../images/logo/256/QtProject-qtcreator.png | Bin .../images/logo/32/QtProject-qtcreator.png | Bin .../images/logo/48/QtProject-qtcreator.png | Bin .../images/logo/512/QtProject-qtcreator.png | Bin .../images/logo/64/QtProject-qtcreator.png | Bin .../coreplugin => app}/images/logo/logo.qbs | 0 src/plugins/coreplugin/CMakeLists.txt | 16 ---------------- src/plugins/coreplugin/coreplugin.qbs | 1 - src/plugins/plugins.qbs | 1 - src/src.qbs | 1 + 18 files changed, 18 insertions(+), 19 deletions(-) rename src/{plugins/coreplugin/core_logo.qrc => app/app_logo.qrc} (100%) rename src/{plugins/coreplugin/core_logo.qrc.cmakein => app/app_logo.qrc.cmakein} (100%) rename src/{plugins/coreplugin => app}/images/logo/128/QtProject-qtcreator.png (100%) rename src/{plugins/coreplugin => app}/images/logo/16/QtProject-qtcreator.png (100%) rename src/{plugins/coreplugin => app}/images/logo/24/QtProject-qtcreator.png (100%) rename src/{plugins/coreplugin => app}/images/logo/256/QtProject-qtcreator.png (100%) rename src/{plugins/coreplugin => app}/images/logo/32/QtProject-qtcreator.png (100%) rename src/{plugins/coreplugin => app}/images/logo/48/QtProject-qtcreator.png (100%) rename src/{plugins/coreplugin => app}/images/logo/512/QtProject-qtcreator.png (100%) rename src/{plugins/coreplugin => app}/images/logo/64/QtProject-qtcreator.png (100%) rename src/{plugins/coreplugin => app}/images/logo/logo.qbs (100%) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 0cafd6591fa..779fe2fb286 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -16,6 +16,6 @@ set(IDE_DOC_FILE_ONLINE "qtcreator/qtcreator-online.qdocconf") # Absolute, or relative to /src/app # Should contain qtcreator.ico, qtcreator.xcassets set(IDE_ICON_PATH "") -# Absolute, or relative to /src/plugins/coreplugin +# Absolute, or relative to /src/app # Should contain images/logo/(16|24|32|48|64|128|256|512)/QtProject-qtcreator.png set(IDE_LOGO_PATH "") diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 940ae30a596..9f2136c5b56 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -9,12 +9,17 @@ install( DESTINATION ${IDE_HEADER_INSTALL_PATH}/src/app COMPONENT Devel EXCLUDE_FROM_ALL ) +if (NOT IS_ABSOLUTE ${IDE_LOGO_PATH}) + set(IDE_LOGO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${IDE_LOGO_PATH}") +endif() +configure_file(app_logo.qrc.cmakein app_logo_cmake.qrc) add_qtc_executable(qtcreator DEFINES IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\" DEPENDS Aggregation ExtensionSystem Qt::Core Qt::Widgets Utils shared_qtsingleapplication app_version SOURCES main.cpp + ${CMAKE_CURRENT_BINARY_DIR}/app_logo_cmake.qrc ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.h PROPERTIES WIN32_EXECUTABLE ON @@ -151,3 +156,13 @@ if(BUILD_WITH_CRASHPAD) DESTINATION "${IDE_LIBEXEC_PATH}" ) endif() + +if ((NOT WIN32) AND (NOT APPLE)) + # install logo + foreach(size 16 24 32 48 64 128 256 512) + install( + FILES ${IDE_LOGO_PATH}/images/logo/${size}/QtProject-qtcreator.png + DESTINATION share/icons/hicolor/${size}x${size}/apps + ) + endforeach() +endif() diff --git a/src/app/app.qbs b/src/app/app.qbs index a0b30ae2ae4..8bce23f6424 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -52,6 +52,7 @@ QtcProduct { files: [ "app-Info.plist", + "app_logo.qrc", "main.cpp", "qtcreator.xcassets", "../shared/qtsingleapplication/qtsingleapplication.h", diff --git a/src/plugins/coreplugin/core_logo.qrc b/src/app/app_logo.qrc similarity index 100% rename from src/plugins/coreplugin/core_logo.qrc rename to src/app/app_logo.qrc diff --git a/src/plugins/coreplugin/core_logo.qrc.cmakein b/src/app/app_logo.qrc.cmakein similarity index 100% rename from src/plugins/coreplugin/core_logo.qrc.cmakein rename to src/app/app_logo.qrc.cmakein diff --git a/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png b/src/app/images/logo/128/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png rename to src/app/images/logo/128/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png b/src/app/images/logo/16/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png rename to src/app/images/logo/16/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png b/src/app/images/logo/24/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png rename to src/app/images/logo/24/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png b/src/app/images/logo/256/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png rename to src/app/images/logo/256/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png b/src/app/images/logo/32/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png rename to src/app/images/logo/32/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png b/src/app/images/logo/48/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png rename to src/app/images/logo/48/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png b/src/app/images/logo/512/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png rename to src/app/images/logo/512/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png b/src/app/images/logo/64/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png rename to src/app/images/logo/64/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/logo.qbs b/src/app/images/logo/logo.qbs similarity index 100% rename from src/plugins/coreplugin/images/logo/logo.qbs rename to src/app/images/logo/logo.qbs diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt index 17d1af01e39..6ae17913b6b 100644 --- a/src/plugins/coreplugin/CMakeLists.txt +++ b/src/plugins/coreplugin/CMakeLists.txt @@ -1,8 +1,3 @@ -if (NOT IS_ABSOLUTE ${IDE_LOGO_PATH}) - set(IDE_LOGO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${IDE_LOGO_PATH}") -endif() -configure_file(core_logo.qrc.cmakein core_logo_cmake.qrc) - add_qtc_plugin(Core DEPENDS Qt::PrintSupport Qt::Qml Qt::Sql Qt::Gui Qt::GuiPrivate PUBLIC_DEPENDS Aggregation ExtensionSystem Utils app_version @@ -16,7 +11,6 @@ add_qtc_plugin(Core actionsfilter.cpp actionsfilter.h basefilewizard.cpp basefilewizard.h basefilewizardfactory.cpp basefilewizardfactory.h - ${CMAKE_CURRENT_BINARY_DIR}/core_logo_cmake.qrc core.qrc core_global.h coreconstants.h @@ -195,16 +189,6 @@ extend_qtc_plugin(Core DEFINES ENABLE_CRASHPAD ) -if ((NOT WIN32) AND (NOT APPLE)) - # install logo - foreach(size 16 24 32 48 64 128 256 512) - install( - FILES ${IDE_LOGO_PATH}/images/logo/${size}/QtProject-qtcreator.png - DESTINATION share/icons/hicolor/${size}x${size}/apps - ) - endforeach() -endif() - set(FONTS_BASE "${QtCreator_SOURCE_DIR}/src/share/3rdparty/studiofonts/") qt_add_resources(Core CoreWelcomeScreenFonts_rcc diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 36edf7f5acf..f849c89a9fc 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -39,7 +39,6 @@ Project { "basefilewizardfactory.h", "core.qrc", "core_global.h", - "core_logo.qrc", "coreconstants.h", "coreicons.cpp", "coreicons.h", diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs index b878e76c3e3..e663bcb037d 100644 --- a/src/plugins/plugins.qbs +++ b/src/plugins/plugins.qbs @@ -24,7 +24,6 @@ Project { "compilationdatabaseprojectmanager/compilationdatabaseprojectmanager.qbs", "conan/conan.qbs", "coreplugin/coreplugin.qbs", - "coreplugin/images/logo/logo.qbs", "cpaster/cpaster.qbs", "cpaster/frontend/frontend.qbs", "cppcheck/cppcheck.qbs", diff --git a/src/src.qbs b/src/src.qbs index b59d8843236..3d39fb7fcd6 100644 --- a/src/src.qbs +++ b/src/src.qbs @@ -8,6 +8,7 @@ Project { references: [ "app/app.qbs", "app/app_version_header.qbs", + "app/images/logo/logo.qbs", "libs/libs.qbs", "plugins/plugins.qbs", "tools/tools.qbs",