diff --git a/src/qtviewer/CMakeLists.txt b/src/qtviewer/CMakeLists.txt index fae7be421a..6d7b9c4f4a 100644 --- a/src/qtviewer/CMakeLists.txt +++ b/src/qtviewer/CMakeLists.txt @@ -41,6 +41,16 @@ set(RESOURCE_FILES resources/qt_res.rc ) +# The MACOSX_BUNDLE_ICON_FILE variable is added to the Info.plist +# generated by CMake. This variable contains the .icns file name, +# without the path. +set(MACOSX_BUNDLE_ICON_FILE ifcosLogo.icns) + +# The following tells CMake where to find and install the file itself. +set(app_icon_macos "resources/ifcosLogo.icns") +set_source_files_properties(${app_icon_macos} PROPERTIES + MACOSX_PACKAGE_LOCATION "Resources") + add_executable(${targetName} IfcViewerWidget.h IfcViewerWidget.cpp @@ -50,6 +60,7 @@ add_executable(${targetName} MainWindow.cpp main.cpp ${RESOURCE_FILES} + ${app_icon_macos} ) set_target_properties(${targetName} PROPERTIES diff --git a/src/qtviewer/main.cpp b/src/qtviewer/main.cpp index 4bd3260ac2..2971093c22 100644 --- a/src/qtviewer/main.cpp +++ b/src/qtviewer/main.cpp @@ -6,11 +6,14 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - // Set the icon in the window title-bar + // Set the icon in the window title-bar on mswindows + // and dock icon on macos. // "icon" alias defined in .qrc file - // (.rc file sets the file icon on mswindows) QIcon appIcon(":/icon"); app.setWindowIcon(appIcon); + // File icon set with: + // mswindows - .rc file + // macos - .icns file (using CMake) MainWindow window; diff --git a/src/qtviewer/resources/ifcopenshell_logo.png b/src/qtviewer/resources/ifcopenshell_logo.png index ac9394a243..c6d7aa7ee5 100644 Binary files a/src/qtviewer/resources/ifcopenshell_logo.png and b/src/qtviewer/resources/ifcopenshell_logo.png differ diff --git a/src/qtviewer/resources/ifcosLogo.icns b/src/qtviewer/resources/ifcosLogo.icns new file mode 100644 index 0000000000..aa4aa1aca8 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.icns differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-100.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-100.png new file mode 100644 index 0000000000..b4c24c3853 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-100.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-1024.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-1024.png new file mode 100644 index 0000000000..8b304dcda0 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-1024.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-114.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-114.png new file mode 100644 index 0000000000..bc6e7819a0 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-114.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-120.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-120.png new file mode 100644 index 0000000000..10e5a914d4 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-120.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-128.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-128.png new file mode 100644 index 0000000000..ebc78e6ff7 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-128.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-144.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-144.png new file mode 100644 index 0000000000..58c4ee9606 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-144.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-152.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-152.png new file mode 100644 index 0000000000..69c235cf2c Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-152.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-16.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-16.png new file mode 100644 index 0000000000..a224e3b277 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-16.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-167.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-167.png new file mode 100644 index 0000000000..f574e0ecb2 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-167.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-172.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-172.png new file mode 100644 index 0000000000..787c331ebc Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-172.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-180.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-180.png new file mode 100644 index 0000000000..fc283da79e Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-180.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-196.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-196.png new file mode 100644 index 0000000000..d3dde8d8f1 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-196.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-20.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-20.png new file mode 100644 index 0000000000..a022a649da Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-20.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-256.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-256.png new file mode 100644 index 0000000000..ac24a41145 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-256.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-29.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-29.png new file mode 100644 index 0000000000..c3323bb400 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-29.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-32.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-32.png new file mode 100644 index 0000000000..8c0fe16c59 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-32.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-40.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-40.png new file mode 100644 index 0000000000..640fd0ce08 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-40.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-48.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-48.png new file mode 100644 index 0000000000..17d13a6dc1 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-48.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-50.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-50.png new file mode 100644 index 0000000000..c7a8034ae9 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-50.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-512.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-512.png new file mode 100644 index 0000000000..23fb7c50e5 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-512.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-55.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-55.png new file mode 100644 index 0000000000..f87a20384b Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-55.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-57.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-57.png new file mode 100644 index 0000000000..53fd85caa8 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-57.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-58.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-58.png new file mode 100644 index 0000000000..1f2828eb82 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-58.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-60.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-60.png new file mode 100644 index 0000000000..8dd4f42626 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-60.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-64.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-64.png new file mode 100644 index 0000000000..bf3bd22bb6 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-64.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-72.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-72.png new file mode 100644 index 0000000000..85f01d6857 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-72.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-76.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-76.png new file mode 100644 index 0000000000..0d0a8e0d00 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-76.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-80.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-80.png new file mode 100644 index 0000000000..4173ac6806 Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-80.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-87.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-87.png new file mode 100644 index 0000000000..651149b5ed Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-87.png differ diff --git a/src/qtviewer/resources/ifcosLogo.iconset/Icon-88.png b/src/qtviewer/resources/ifcosLogo.iconset/Icon-88.png new file mode 100644 index 0000000000..2f44ab9eed Binary files /dev/null and b/src/qtviewer/resources/ifcosLogo.iconset/Icon-88.png differ