Version 0.9.49: disabling high dpi scaling in all systems except OS X.

This commit is contained in:
John Preston 2016-05-15 13:30:47 +03:00
parent fb024e2256
commit c2a5ab0c5a
7 changed files with 23 additions and 19 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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();

View File

@ -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;

View File

@ -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();

View File

@ -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;

View File

@ -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