From 8fcc9494fe83878377c899570e5b3ceaea084c90 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 20 Sep 2014 14:52:47 -0700
Subject: [PATCH] prepared 0.5.20: photos blur, mac tray icon, apple emojis,
win version signed
---
Telegram/PrepareLinux.sh | 4 ++--
Telegram/PrepareLinux32.sh | 4 ++--
Telegram/PrepareMac.sh | 4 ++--
Telegram/Setup.iss | 6 +++---
Telegram/SignWin.bat | 4 ++++
Telegram/SignWinSetup.bat | 3 +++
Telegram/SourceFiles/config.h | 4 ++--
Telegram/SourceFiles/pspecific_wnd.h | 1 +
Telegram/Telegram.plist | 2 +-
Telegram/Telegram.rc | Bin 5566 -> 5566 bytes
Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------
11 files changed, 26 insertions(+), 18 deletions(-)
create mode 100644 Telegram/SignWin.bat
create mode 100644 Telegram/SignWinSetup.bat
diff --git a/Telegram/PrepareLinux.sh b/Telegram/PrepareLinux.sh
index 0de6f1e22..071f4f4b6 100755
--- a/Telegram/PrepareLinux.sh
+++ b/Telegram/PrepareLinux.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.5.19
-AppVersion=5019
+AppVersionStr=0.5.20
+AppVersion=5020
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 d0ec281ba..fb0f79e7e 100755
--- a/Telegram/PrepareLinux32.sh
+++ b/Telegram/PrepareLinux32.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.5.19
-AppVersion=5019
+AppVersionStr=0.5.20
+AppVersion=5020
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 3a7b71d69..5af19cba4 100755
--- a/Telegram/PrepareMac.sh
+++ b/Telegram/PrepareMac.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.5.19
-AppVersion=5019
+AppVersionStr=0.5.20
+AppVersion=5020
if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!"
diff --git a/Telegram/Setup.iss b/Telegram/Setup.iss
index fd5ddde46..d7a99f0fe 100644
--- a/Telegram/Setup.iss
+++ b/Telegram/Setup.iss
@@ -3,9 +3,9 @@
#define MyAppShortName "Telegram"
#define MyAppName "Telegram Win (Unofficial)"
-#define MyAppVersion "0.5.19"
-#define MyAppVersionZero "0.5.19"
-#define MyAppFullVersion "0.5.19.0"
+#define MyAppVersion "0.5.20"
+#define MyAppVersionZero "0.5.20"
+#define MyAppFullVersion "0.5.20.0"
#define MyAppPublisher "Telegram (Unofficial)"
#define MyAppURL "https://tdesktop.com"
#define MyAppExeName "Telegram.exe"
diff --git a/Telegram/SignWin.bat b/Telegram/SignWin.bat
new file mode 100644
index 000000000..898b623d0
--- /dev/null
+++ b/Telegram/SignWin.bat
@@ -0,0 +1,4 @@
+cd ..\Win32\Deploy
+call ..\..\..\TelegramPrivate\Sign.bat Telegram.exe
+call ..\..\..\TelegramPrivate\Sign.bat Updater.exe
+cd ..\..\Telegram
diff --git a/Telegram/SignWinSetup.bat b/Telegram/SignWinSetup.bat
new file mode 100644
index 000000000..97782e52b
--- /dev/null
+++ b/Telegram/SignWinSetup.bat
@@ -0,0 +1,3 @@
+cd ..\Win32\Deploy
+call ..\..\..\TelegramPrivate\Sign.bat tsetup.0.6.0.exe
+cd ..\..\Telegram
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 10a582bd3..3351ebe34 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 = 5019;
-static const wchar_t *AppVersionStr = L"0.5.19";
+static const int32 AppVersion = 5020;
+static const wchar_t *AppVersionStr = L"0.5.20";
#ifdef Q_OS_WIN
static const wchar_t *AppName = L"Telegram Win (Unofficial)";
#else
diff --git a/Telegram/SourceFiles/pspecific_wnd.h b/Telegram/SourceFiles/pspecific_wnd.h
index 41efa007e..cd89bf9d0 100644
--- a/Telegram/SourceFiles/pspecific_wnd.h
+++ b/Telegram/SourceFiles/pspecific_wnd.h
@@ -87,6 +87,7 @@ protected:
bool posInited;
QSystemTrayIcon *trayIcon;
QMenu *trayIconMenu;
+ QImage icon256;
virtual void setupTrayIcon() = 0;
virtual QImage iconWithCounter(int size, int count, style::color bg, bool smallIcon) = 0;
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index b5cc81cb0..ff1a4d4ec 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.5.19</string>
+ <string>0.5.20</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>NOTE</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index 3d58a51157d71c239b891a466a37eb53d76c5929..76b000326419f43ac8d2425288d61543ae893e24 100644
GIT binary patch
delta 66
zcmdm|y-$0C4mYzAgTZ8dZbNn;&7cEhZ{(KT+`wJH1QyT(3e4rz-K@eV!-ymxzB!IR
Gfeio!l@87T
delta 66
zcmdm|y-$0C4mYzQgXLs>ZbNn;&7i|zFnJ@l<mLwM0w%D49#CK|ukL0QJ{d+N0rAao
H{0VFT3N;Sy
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 27390d8a2..5e607ae20 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1487,7 +1487,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.5.19;
+ CURRENT_PROJECT_VERSION = 0.5.20;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1505,7 +1505,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 0.5.19;
+ CURRENT_PROJECT_VERSION = 0.5.20;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1531,10 +1531,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.5.19;
+ CURRENT_PROJECT_VERSION = 0.5.20;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.5;
- DYLIB_CURRENT_VERSION = 0.5.19;
+ DYLIB_CURRENT_VERSION = 0.5.20;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1673,10 +1673,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.5.19;
+ CURRENT_PROJECT_VERSION = 0.5.20;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.5;
- DYLIB_CURRENT_VERSION = 0.5.19;
+ DYLIB_CURRENT_VERSION = 0.5.20;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;