From 85ca7e0f055ffd0e6f8c7911b9e0d355350d34ab Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 18 Nov 2014 15:59:16 +0300 Subject: [PATCH] version 0.6.10 prepared --- Telegram/DeployLinux.sh | 4 ++-- Telegram/DeployLinux32.sh | 4 ++-- Telegram/DeployMacWin.sh | 4 ++-- Telegram/DeployWin.sh | 4 ++-- Telegram/PrepareLinux.sh | 4 ++-- Telegram/PrepareLinux32.sh | 4 ++-- Telegram/PrepareMac.sh | 4 ++-- Telegram/PrepareWin.bat | 2 +- Telegram/Resources/style.txt | 2 +- Telegram/Setup.iss | 6 +++--- Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/history.cpp | 4 ++++ Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5542 -> 5550 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ 15 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Telegram/DeployLinux.sh b/Telegram/DeployLinux.sh index b7c91ea4d..e08f79dbb 100755 --- a/Telegram/DeployLinux.sh +++ b/Telegram/DeployLinux.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.9 -AppVersion=6009 +AppVersionStr=0.6.10 +AppVersion=6010 if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinuxupd$AppVersion" ]; then echo "tlinuxupd$AppVersion not found!"; diff --git a/Telegram/DeployLinux32.sh b/Telegram/DeployLinux32.sh index 52ac0becc..bc6d7d598 100755 --- a/Telegram/DeployLinux32.sh +++ b/Telegram/DeployLinux32.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.9 -AppVersion=6009 +AppVersionStr=0.6.10 +AppVersion=6010 if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinux32upd$AppVersion" ]; then echo "tlinux32upd$AppVersion not found!" diff --git a/Telegram/DeployMacWin.sh b/Telegram/DeployMacWin.sh index 3650c36d0..d158f318f 100755 --- a/Telegram/DeployMacWin.sh +++ b/Telegram/DeployMacWin.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.9 -AppVersion=6009 +AppVersionStr=0.6.10 +AppVersion=6010 if [ ! -f "./../Mac/Release/deploy/$AppVersionStr/tmacupd$AppVersion" ]; then echo "tmacupd$AppVersion not found!" diff --git a/Telegram/DeployWin.sh b/Telegram/DeployWin.sh index a3f186836..2085bcf2c 100644 --- a/Telegram/DeployWin.sh +++ b/Telegram/DeployWin.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.9 -AppVersion=6009 +AppVersionStr=0.6.10 +AppVersion=6010 if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tupdate$AppVersion" ]; then echo "tupdate$AppVersion not found!" diff --git a/Telegram/PrepareLinux.sh b/Telegram/PrepareLinux.sh index cda49b097..e2ee19559 100755 --- a/Telegram/PrepareLinux.sh +++ b/Telegram/PrepareLinux.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.9 -AppVersion=6009 +AppVersionStr=0.6.10 +AppVersion=6010 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then echo "Deploy folder for version $AppVersionStr already exists!" diff --git a/Telegram/PrepareLinux32.sh b/Telegram/PrepareLinux32.sh index bce013a24..c85796395 100755 --- a/Telegram/PrepareLinux32.sh +++ b/Telegram/PrepareLinux32.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.9 -AppVersion=6009 +AppVersionStr=0.6.10 +AppVersion=6010 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then echo "Deploy folder for version $AppVersionStr already exists!" diff --git a/Telegram/PrepareMac.sh b/Telegram/PrepareMac.sh index 154e0704f..920bfea13 100755 --- a/Telegram/PrepareMac.sh +++ b/Telegram/PrepareMac.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.9 -AppVersion=6009 +AppVersionStr=0.6.10 +AppVersion=6010 echo "" echo "Preparing version $AppVersionStr.." diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 186cad0a1..8cfee8704 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,6 +1,6 @@ @echo OFF -set "AppVersionStr=0.6.9" +set "AppVersionStr=0.6.10" echo. echo Preparing version %AppVersionStr%.. echo. diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt index b57cb36ae..c7e3a083b 100644 --- a/Telegram/Resources/style.txt +++ b/Telegram/Resources/style.txt @@ -1625,7 +1625,7 @@ mediaviewLoaderSkip: 9px; minPhotoWidth: 90px; minPhotoHeight: 90px; -maxMediaSize: 400px; +maxMediaSize: 420px; usernameFont: font(14px); usernameColor: #777; diff --git a/Telegram/Setup.iss b/Telegram/Setup.iss index 00a196c32..ebe754614 100644 --- a/Telegram/Setup.iss +++ b/Telegram/Setup.iss @@ -3,9 +3,9 @@ #define MyAppShortName "Telegram" #define MyAppName "Telegram Desktop" -#define MyAppVersion "0.6.9" -#define MyAppVersionZero "0.6.9" -#define MyAppFullVersion "0.6.9.0" +#define MyAppVersion "0.6.10" +#define MyAppVersionZero "0.6.10" +#define MyAppFullVersion "0.6.10.0" #define MyAppPublisher "Telegram Messenger LLP" #define MyAppURL "https://tdesktop.com" #define MyAppExeName "Telegram.exe" diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 464710498..10b3e17a7 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com */ #pragma once -static const int32 AppVersion = 6009; -static const wchar_t *AppVersionStr = L"0.6.9"; +static const int32 AppVersion = 6010; +static const wchar_t *AppVersionStr = L"0.6.10"; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 20385ec7c..ea493e35b 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -2105,6 +2105,10 @@ int32 HistoryPhoto::resize(int32 width, bool dontRecountText, const HistoryItem th = (st::maxMediaSize * th) / tw; tw = st::maxMediaSize; } + if (th > st::maxMediaSize) { + tw = (st::maxMediaSize * tw) / th; + th = st::maxMediaSize; + } _height = th; if (tw > w) { _height = (w * _height / tw); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 4abefb662..8159c7425 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.6.9 + 0.6.10 CFBundleSignature ???? NOTE diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index c4eaa8e992ca678d229e2b0cc04a2026f0bef91e..899a76393c468922030d3afad101c31984092bbc 100644 GIT binary patch delta 50 xcmZ3cy-s_B4mYzQgTZ87ZbJ~gIi9