From 24ffe47ca03b10bb667ff85fe358d1920281cb85 Mon Sep 17 00:00:00 2001 From: dnk-88 Date: Fri, 15 Apr 2011 15:25:01 +0300 Subject: [PATCH] Changed: #1193 ovqt has been changed main logo. --- .../3d/object_viewer_qt/src/CMakeLists.txt | 7 ++- .../3d/object_viewer_qt/src/ic_nel_pill.ico | Bin 0 -> 67646 bytes .../object_viewer_qt/src/object_viewer_qt.rc | 54 ++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 code/nel/tools/3d/object_viewer_qt/src/ic_nel_pill.ico create mode 100644 code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.rc diff --git a/code/nel/tools/3d/object_viewer_qt/src/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/CMakeLists.txt index 344417e3f..3cbe745af 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/CMakeLists.txt +++ b/code/nel/tools/3d/object_viewer_qt/src/CMakeLists.txt @@ -19,6 +19,10 @@ SET(OBJECT_VIEWER_TS translations/object_viewer_qt_en.ts SET(QT_USE_QTGUI TRUE) SET(QT_USE_QTOPENGL TRUE) + +IF(WIN32) + SET(OBJECT_VIEWER_RC object_viewer_qt.rc) +ENDIF(WIN32) QT4_ADD_TRANSLATION(OBJECT_VIEWER_QM ${OBJECT_VIEWER_TS}) QT4_ADD_RESOURCES( OBJECT_VIEWER_RC_SRCS ${OBJECT_VIEWER_RCS}) @@ -30,7 +34,8 @@ SOURCE_GROUP(QtGeneratedMocQrcSrc FILES ${OBJECT_VIEWER_MOC_SRCS} ${OBJECT_VIEWE ADD_EXECUTABLE(object_viewer_qt WIN32 MACOSX_BUNDLE ${OBJECT_VIEWER_SRC} ${OBJECT_VIEWER_MOC_SRCS} - ${OBJECT_VIEWER_RC_SRCS}) + ${OBJECT_VIEWER_RC_SRCS} + ${OBJECT_VIEWER_RC}) TARGET_LINK_LIBRARIES(object_viewer_qt nelmisc diff --git a/code/nel/tools/3d/object_viewer_qt/src/ic_nel_pill.ico b/code/nel/tools/3d/object_viewer_qt/src/ic_nel_pill.ico new file mode 100644 index 0000000000000000000000000000000000000000..ce8a2629a387502b2b2ce6e0c4f520acc9187f73 GIT binary patch literal 67646 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 literal 0 HcmV?d00001 diff --git a/code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.rc b/code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.rc new file mode 100644 index 000000000..a0f0e7099 --- /dev/null +++ b/code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.rc @@ -0,0 +1,54 @@ +#include + +#define IDR_MAINFRAME 128 + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Ryzom Core\0" + VALUE "FileDescription", "\0" + VALUE "FileVersion", "1, 0, 0, 1\0" + VALUE "InternalName", "Object_Viewer_Qt\0" + VALUE "LegalCopyright", "Copyright (C) 2011\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Object Viewer Qt\0" + VALUE "ProductVersion", "1, 0, 0, 1\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDR_MAINFRAME ICON DISCARDABLE "ic_nel_pill.ico"