From c2a5ab0c5a9184032319dd6725a822c95e11e0c7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 15 May 2016 13:30:47 +0300 Subject: [PATCH] Version 0.9.49: disabling high dpi scaling in all systems except OS X. --- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/application.cpp | 4 ++-- Telegram/SourceFiles/core/version.h | 6 +++--- Telegram/SourceFiles/main.cpp | 4 ++++ Telegram/Telegram.xcodeproj/project.pbxproj | 4 ++-- Telegram/build/version | 8 ++++---- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index ee19b5322b..65d2ba0f44 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,48,1 - PRODUCTVERSION 0,9,48,1 + FILEVERSION 0,9,49,0 + PRODUCTVERSION 0,9,49,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.48.1" + VALUE "FileVersion", "0.9.49.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.48.1" + VALUE "ProductVersion", "0.9.49.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 6f897a376c..9fc56b8bfb 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,48,1 - PRODUCTVERSION 0,9,48,1 + FILEVERSION 0,9,49,0 + PRODUCTVERSION 0,9,49,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.9.48.1" + VALUE "FileVersion", "0.9.49.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.48.1" + VALUE "ProductVersion", "0.9.49.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index e86263622d..0b4470dbf3 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -1031,10 +1031,10 @@ void AppClass::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9041) { + if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9049) { versionFeatures = QString::fromUtf8("\xe2\x80\x94 Select and copy text in photo / video captions and web page previews\n\xe2\x80\x94 Media player shortcuts are enabled only when player is opened"); // versionFeatures = langNewVersionText(); - } else if (Local::oldMapVersion() < 9041) { + } else if (Local::oldMapVersion() < 9049) { versionFeatures = langNewVersionText(); } else { versionFeatures = lang(lng_new_version_minor).trimmed(); diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 31c790162e..df192203ad 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,9 +22,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "core/basic_types.h" -#define BETA_VERSION_MACRO (9048001ULL) +#define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 9048; -constexpr str_const AppVersionStr = "0.9.48"; +constexpr int AppVersion = 9049; +constexpr str_const AppVersionStr = "0.9.49"; constexpr bool AppAlphaVersion = false; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp index e0300abb6b..0b704044be 100644 --- a/Telegram/SourceFiles/main.cpp +++ b/Telegram/SourceFiles/main.cpp @@ -25,6 +25,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "localstorage.h" int main(int argc, char *argv[]) { +#ifndef Q_OS_MAC // Retina display support is working fine, others are not. + QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); +#endif // Q_OS_MAC + settingsParseArgs(argc, argv); if (cLaunchMode() == LaunchModeFixPrevious) { return psFixPrevious(); diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 6d1a1ff413..fa9500d161 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -2028,7 +2028,7 @@ SDKROOT = macosx; SYMROOT = ./../Mac; TDESKTOP_MAJOR_VERSION = 0.9; - TDESKTOP_VERSION = 0.9.48; + TDESKTOP_VERSION = 0.9.49; ZLIB_PATH = /usr/local; }; name = Release; @@ -2169,7 +2169,7 @@ SDKROOT = macosx; SYMROOT = ./../Mac; TDESKTOP_MAJOR_VERSION = 0.9; - TDESKTOP_VERSION = 0.9.48; + TDESKTOP_VERSION = 0.9.49; ZLIB_PATH = /usr/local; }; name = Debug; diff --git a/Telegram/build/version b/Telegram/build/version index ecb2c68fb8..648a9fccf8 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 9048 +AppVersion 9049 AppVersionStrMajor 0.9 -AppVersionStrSmall 0.9.48 -AppVersionStr 0.9.48 +AppVersionStrSmall 0.9.49 +AppVersionStr 0.9.49 AlphaChannel 0 -BetaVersion 9048001 +BetaVersion 0