From fea7148e9b9dfacbd2e01a6f81194494e602dacd Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Fri, 24 Apr 2020 17:07:15 +0300 Subject: [PATCH] Use separate .rc files --- Telegram/CMakeLists.txt | 7 +- Telegram/Resources/winrc/Kotatogram.rc | 72 +++++++++++++++++++ Telegram/Resources/winrc/KotatogramUpdater.rc | 58 +++++++++++++++ Telegram/Resources/winrc/Telegram.rc | 21 +++--- Telegram/Resources/winrc/Updater.rc | 16 ++--- 5 files changed, 152 insertions(+), 22 deletions(-) create mode 100644 Telegram/Resources/winrc/Kotatogram.rc create mode 100644 Telegram/Resources/winrc/KotatogramUpdater.rc diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index f08488613..62e39bed9 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -1038,7 +1038,7 @@ PRIVATE qrc/emoji_preview.qrc qrc/telegram/telegram.qrc qrc/telegram/sounds.qrc - winrc/Telegram.rc + winrc/Kotatogram.rc winrc/Telegram.manifest langs/lang.strings numbers.txt @@ -1209,6 +1209,11 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR NOT LINUX) AND NOT build_macstore AND _other/updater.h ) + nice_target_sources(Updater ${res_loc} + PRIVATE + winrc/KotatogramUpdater.rc + ) + set_target_properties(Updater PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder}) if (LINUX) diff --git a/Telegram/Resources/winrc/Kotatogram.rc b/Telegram/Resources/winrc/Kotatogram.rc new file mode 100644 index 000000000..63d449280 --- /dev/null +++ b/Telegram/Resources/winrc/Kotatogram.rc @@ -0,0 +1,72 @@ +// Microsoft Visual C++ generated resource script. +// + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON "..\\art\\icon256.ico" +IDI_ICON2 ICON "..\\art\\icon256blue.ico" +IDI_ICON3 ICON "..\\art\\icon256green.ico" +IDI_ICON4 ICON "..\\art\\icon256orange.ico" +IDI_ICON5 ICON "..\\art\\icon256red.ico" +IDI_ICON6 ICON "..\\art\\icon256old.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Kotatogram" + VALUE "FileDescription", "Kotatogram Desktop" + VALUE "FileVersion", "1.2.2.0" + VALUE "LegalCopyright", "Copyright (C) 2019-2020" + VALUE "ProductName", "Kotatogram Desktop" + VALUE "ProductVersion", "1.2.2.0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// diff --git a/Telegram/Resources/winrc/KotatogramUpdater.rc b/Telegram/Resources/winrc/KotatogramUpdater.rc new file mode 100644 index 000000000..2c17f2650 --- /dev/null +++ b/Telegram/Resources/winrc/KotatogramUpdater.rc @@ -0,0 +1,58 @@ +// Microsoft Visual C++ generated resource script. +// + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Kotatogram" + VALUE "FileDescription", "Kotatogram Desktop Updater" + VALUE "FileVersion", "1.2.2.0" + VALUE "LegalCopyright", "Copyright (C) 2019-2020" + VALUE "ProductName", "Kotatogram Desktop" + VALUE "ProductVersion", "1.2.2.0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 63d449280..b8bba0b66 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -26,11 +26,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_ICON1 ICON "..\\art\\icon256.ico" -IDI_ICON2 ICON "..\\art\\icon256blue.ico" -IDI_ICON3 ICON "..\\art\\icon256green.ico" -IDI_ICON4 ICON "..\\art\\icon256orange.ico" -IDI_ICON5 ICON "..\\art\\icon256red.ico" -IDI_ICON6 ICON "..\\art\\icon256old.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -38,8 +33,8 @@ IDI_ICON6 ICON "..\\art\\icon256old.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,2,0 - PRODUCTVERSION 1,2,2,0 + FILEVERSION 2,1,0,0 + PRODUCTVERSION 2,1,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -54,12 +49,12 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Kotatogram" - VALUE "FileDescription", "Kotatogram Desktop" - VALUE "FileVersion", "1.2.2.0" - VALUE "LegalCopyright", "Copyright (C) 2019-2020" - VALUE "ProductName", "Kotatogram Desktop" - VALUE "ProductVersion", "1.2.2.0" + VALUE "CompanyName", "Telegram FZ-LLC" + VALUE "FileDescription", "Telegram Desktop" + VALUE "FileVersion", "2.1.0.0" + VALUE "LegalCopyright", "Copyright (C) 2014-2020" + VALUE "ProductName", "Telegram Desktop" + VALUE "ProductVersion", "2.1.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 2c17f2650..3017e78f5 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,2,0 - PRODUCTVERSION 1,2,2,0 + FILEVERSION 2,1,0,0 + PRODUCTVERSION 2,1,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -40,12 +40,12 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Kotatogram" - VALUE "FileDescription", "Kotatogram Desktop Updater" - VALUE "FileVersion", "1.2.2.0" - VALUE "LegalCopyright", "Copyright (C) 2019-2020" - VALUE "ProductName", "Kotatogram Desktop" - VALUE "ProductVersion", "1.2.2.0" + VALUE "CompanyName", "Telegram FZ-LLC" + VALUE "FileDescription", "Telegram Desktop Updater" + VALUE "FileVersion", "2.1.0.0" + VALUE "LegalCopyright", "Copyright (C) 2014-2020" + VALUE "ProductName", "Telegram Desktop" + VALUE "ProductVersion", "2.1.0.0" END END BLOCK "VarFileInfo"