From 206176eeb79c402261176eb3c28cb6b52fcbf3eb Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 19 Feb 2015 15:22:59 +0300 Subject: [PATCH] version 0.7.17 prepared --- Telegram/PrepareWin.bat | 8 ++++---- Telegram/SourceFiles/application.cpp | 4 ++-- Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/mediaview.cpp | 6 ++---- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 49248c9d8..23c286dc6 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,9 +1,9 @@ @echo OFF -set "AppVersion=7016" -set "AppVersionStrSmall=0.7.16" -set "AppVersionStr=0.7.16" -set "AppVersionStrFull=0.7.16.0" +set "AppVersion=7017" +set "AppVersionStrSmall=0.7.17" +set "AppVersionStr=0.7.17" +set "AppVersionStrFull=0.7.17.0" set "DevChannel=0" if %DevChannel% neq 0 goto preparedev diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 4054c98b6..b894d74ca 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -704,8 +704,8 @@ void Application::startApp() { QString versionFeatures; if (DevChannel && Local::oldMapVersion() < 7015) { versionFeatures = QString::fromUtf8("\xe2\x80\x94 Some translation keys added\n\xe2\x80\x94 Linux: fixed semibold font\n\xe2\x80\x94 Linux: tray icon should work better in non-Unity environments"); - } else if (!DevChannel && Local::oldMapVersion() < 7016) { - versionFeatures = lang(lng_new_version7016).trimmed(); + } else if (!DevChannel && Local::oldMapVersion() < 7017) { + versionFeatures = lang(lng_new_version_minor).trimmed(); } if (!versionFeatures.isEmpty()) { versionFeatures = lng_new_version_wrap(lt_version, QString::fromStdWString(AppVersionStr), lt_changes, versionFeatures, lt_link, qsl("https://desktop.telegram.org/#changelog")); diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index b42b299a4..410f8824a 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 7016; -static const wchar_t *AppVersionStr = L"0.7.16"; +static const int32 AppVersion = 7017; +static const wchar_t *AppVersionStr = L"0.7.17"; static const bool DevChannel = false; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index 8ded4a887..8128abe63 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -71,10 +71,8 @@ _saveMsgStarted(0), _saveMsgOpacity(0) setMouseTracking(true); hide(); - psUpdateOverlayed(this); - show(); - hide(); - + createWinId(); + connect(&_close, SIGNAL(clicked()), this, SLOT(onClose())); connect(&_save, SIGNAL(clicked()), this, SLOT(onDownload())); connect(&_forward, SIGNAL(clicked()), this, SLOT(onForward())); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 15c3decb9..c293b73f9 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.7.16 + 0.7.17 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index c0e5eac939759f563e802c31538b9feadc08c0cb..9720c09f675fcb962e582bc69403e2bf32b4591b 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig_p6O delta 53 zcmZ3Yy+nIM5ig_J