diff --git a/src/qtviewer/CMakeLists.txt b/src/qtviewer/CMakeLists.txt index f8da024edb..fae7be421a 100644 --- a/src/qtviewer/CMakeLists.txt +++ b/src/qtviewer/CMakeLists.txt @@ -38,6 +38,7 @@ set(CMAKE_AUTORCC ON) set(RESOURCE_FILES resources/qt_resources.qrc + resources/qt_res.rc ) add_executable(${targetName} @@ -48,6 +49,7 @@ add_executable(${targetName} MainWindow.h MainWindow.cpp main.cpp + ${RESOURCE_FILES} ) set_target_properties(${targetName} PROPERTIES diff --git a/src/qtviewer/main.cpp b/src/qtviewer/main.cpp index a6af906d00..4bd3260ac2 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); - QIcon appIcon(":/resources/ifcopenshell_logo.png"); + // Set the icon in the window title-bar + // "icon" alias defined in .qrc file + // (.rc file sets the file icon on mswindows) + QIcon appIcon(":/icon"); + app.setWindowIcon(appIcon); MainWindow window; - window.setWindowIcon(appIcon); window.show(); return app.exec(); diff --git a/src/qtviewer/resources/ifcopenshell_logo.ico b/src/qtviewer/resources/ifcopenshell_logo.ico index 5414ae3971..6ec70ca6c6 100644 Binary files a/src/qtviewer/resources/ifcopenshell_logo.ico and b/src/qtviewer/resources/ifcopenshell_logo.ico differ diff --git a/src/qtviewer/resources/qt_res.aps b/src/qtviewer/resources/qt_res.aps new file mode 100644 index 0000000000..48959dca7b Binary files /dev/null and b/src/qtviewer/resources/qt_res.aps differ diff --git a/src/qtviewer/resources/qt_res.rc b/src/qtviewer/resources/qt_res.rc new file mode 100644 index 0000000000..06595be934 --- /dev/null +++ b/src/qtviewer/resources/qt_res.rc @@ -0,0 +1,37 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON "ifcopenshell_logo.ico" diff --git a/src/qtviewer/resources/qt_resources.qrc b/src/qtviewer/resources/qt_resources.qrc index 97d832449d..9adc51b707 100644 --- a/src/qtviewer/resources/qt_resources.qrc +++ b/src/qtviewer/resources/qt_resources.qrc @@ -1,6 +1,5 @@ - ifcopenshell_logo.png - ifcopenshell_logo.ico + ifcopenshell_logo.png diff --git a/src/qtviewer/resources/resource.h b/src/qtviewer/resources/resource.h new file mode 100644 index 0000000000..7112d62142 --- /dev/null +++ b/src/qtviewer/resources/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by qt_res.rc +// +#define IDI_ICON1 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif