From ebfeeb6872b8e05c9da916950655cd79dc2e3fea Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Mar 2016 05:46:34 +0300
Subject: [PATCH] dev version 0.9.29
---
Telegram/SourceFiles/application.cpp | 5 +++--
Telegram/SourceFiles/config.h | 8 ++++----
Telegram/Telegram.plist | 2 +-
Telegram/Telegram.rc | 8 ++++----
Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------
Telegram/Version | 10 +++++-----
6 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index fca1d7df4..6989c9b2d 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -1035,8 +1035,9 @@ void AppClass::checkMapVersion() {
if (Local::oldMapVersion() < AppVersion) {
if (Local::oldMapVersion()) {
QString versionFeatures;
- if ((cDevVersion() || cBetaVersion()) && Local::oldMapVersion() < 9027) {
- versionFeatures = QString::fromUtf8("\xe2\x80\x94 Edit your messages in channels and supergroups.\n\xe2\x80\x94 Share links to specific posts in channels via the post context menu.\n\xe2\x80\x94 Add admin signatures to messages in channels.\n\xe2\x80\x94 Send silent messages in channels that will not notify members. Useful for non-urgent or late night posting.");// .replace('@', qsl("@") + QChar(0x200D));
+ if ((cDevVersion() || cBetaVersion()) && Local::oldMapVersion() < 9029) {
+ QString ctrl = (cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? qsl("Cmd") : qsl("Ctrl");
+ versionFeatures = QString::fromUtf8("\xe2\x80\x94 %1+W or %2+F4 for close window\n\xe2\x80\x94 %3+L to lock Telegram if you use a local passcode\n\xe2\x80\x94 Bug fixes and other minor improvements").arg(ctrl).arg(ctrl).arg(ctrl);// .replace('@', qsl("@") + QChar(0x200D));
} else if (Local::oldMapVersion() < 9027) {
versionFeatures = lang(lng_new_version_text).trimmed();
} else {
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 5e68c9995..9e4060c8b 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
*/
#pragma once
-static const int32 AppVersion = 9028;
-static const wchar_t *AppVersionStr = L"0.9.28";
-static const bool DevVersion = false;
-#define BETA_VERSION (9028002ULL) // just comment this line to build public version
+static const int32 AppVersion = 9029;
+static const wchar_t *AppVersionStr = L"0.9.29";
+static const bool DevVersion = true;
+//#define BETA_VERSION (9028002ULL) // just comment this line to build public version
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
static const wchar_t *AppName = L"Telegram Desktop";
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index cf5bb6c5e..d4df84bc4 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.9.28</string>
+ <string>0.9.29</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index f82064666..4a040b972 100644
--- a/Telegram/Telegram.rc
+++ b/Telegram/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,28,2
- PRODUCTVERSION 0,9,28,2
+ FILEVERSION 0,9,29,0
+ PRODUCTVERSION 0,9,29,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
- VALUE "FileVersion", "0.9.28.2"
+ VALUE "FileVersion", "0.9.29.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "0.9.28.2"
+ VALUE "ProductVersion", "0.9.29.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 496b74e15..f33e49f05 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1726,7 +1726,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.9.28;
+ CURRENT_PROJECT_VERSION = 0.9.29;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1745,7 +1745,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 0.9.28;
+ CURRENT_PROJECT_VERSION = 0.9.29;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1774,10 +1774,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.9.28;
+ CURRENT_PROJECT_VERSION = 0.9.29;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.9;
- DYLIB_CURRENT_VERSION = 0.9.28;
+ DYLIB_CURRENT_VERSION = 0.9.29;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1915,10 +1915,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.9.28;
+ CURRENT_PROJECT_VERSION = 0.9.29;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.9;
- DYLIB_CURRENT_VERSION = 0.9.28;
+ DYLIB_CURRENT_VERSION = 0.9.29;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "";
diff --git a/Telegram/Version b/Telegram/Version
index c6c53f35a..a89b5197d 100644
--- a/Telegram/Version
+++ b/Telegram/Version
@@ -1,6 +1,6 @@
-AppVersion 9028
+AppVersion 9029
AppVersionStrMajor 0.9
-AppVersionStrSmall 0.9.28
-AppVersionStr 0.9.28
-DevChannel 0
-BetaVersion 9028002
+AppVersionStrSmall 0.9.29
+AppVersionStr 0.9.29
+DevChannel 1
+BetaVersion 0 9028002