RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2024-12-15 10:54:48 +00:00
Code Issues Projects Releases Wiki Activity

preparing version 0.8.13 with new emoji pan

Browse Source
This commit is contained in:
John Preston 2015-05-11 13:18:57 +03:00
parent 9761c5bb56
commit 2d46cc4c11
9 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/PrepareWin.bat
View File

@ -1,10 +1,10 @@
@echo OFF
set "AppVersion=8012"
set "AppVersionStrSmall=0.8.12"
set "AppVersionStr=0.8.12"
set "AppVersionStrFull=0.8.12.0"
set "DevChannel=1"
set "AppVersion=8013"
set "AppVersionStrSmall=0.8.13"
set "AppVersionStr=0.8.13"
set "AppVersionStrFull=0.8.13.0"
set "DevChannel=0"
if %DevChannel% neq 0 goto preparedev

12
Telegram/Resources/lang.strings
View File

@ -389,16 +389,16 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
"lng_action_changed_title" = "{from} changed group name to «{title}»";
"lng_action_created_chat" = "{from} created group «{title}»";
"lng_group_invite_bad_link" = "This invite link is broken\nor it has expired.";
"lng_group_invite_bad_link" = "This invite link is broken\nor has expired.";
"lng_group_invite_want_join" = "Do you want to join the group «{title}»?";
"lng_group_invite_join" = "Join";
"lng_group_invite_link" = "Invite link";
"lng_group_invite_create" = "Create an invite link";
"lng_group_invite_about" = "You can create a link for joining this group.\nAnyone who has that link can join.";
"lng_group_invite_create_new" = "Create new link";
"lng_group_invite_about_new" = "Current invite link will stop working\nwhen you create a new one.";
"lng_group_invite_copied" = "Invite link was copied to clipboard.";
"lng_group_invite_about" = "Anyone who has Telegram installed will be\nable to join your group by following this link.";
"lng_group_invite_create_new" = "Revoke invite link";
"lng_group_invite_about_new" = "The previous invite link will become\ninactive. A new invite link will be generated.";
"lng_group_invite_copied" = "Invite link copied to clipboard.";
"lng_group_invite_no_room" = "Unable to join this group because there are\ntoo many members in it already.";
"lng_forwarded_from" = "Forwarded from";
@ -573,7 +573,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram Desktop was updated to version {version}\n\n{changes}\n\nFull version history is available here:\n{link}";
"lng_new_version_minor" = "— Bug fixes and other minor improvements";
"lng_new_version_text" = "— Invite links for group chats\n— Gray unread badge for muted conversations";
"lng_new_version_text" = "— Added support for new emoji\n— Improved emoji and stickers panel";
"lng_menu_insert_unicode" = "Insert Unicode control character";

2
Telegram/SourceFiles/application.cpp
View File

@ -664,7 +664,7 @@ void Application::checkMapVersion() {
QString versionFeatures;
if (DevChannel && Local::oldMapVersion() < 8012) {
versionFeatures = QString::fromUtf8("\xe2\x80\x94 New emojis support added\n\xe2\x80\x94 Emojis and stickers panel improved").replace('@', qsl("@") + QChar(0x200D));
} else if (!DevChannel && Local::oldMapVersion() < 8011) {
} else if (!DevChannel && Local::oldMapVersion() < 8013) {
versionFeatures = lang(lng_new_version_text).trimmed();
}
if (!versionFeatures.isEmpty()) {

6
Telegram/SourceFiles/config.h
View File

@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/
#pragma once
static const int32 AppVersion = 8012;
static const wchar_t *AppVersionStr = L"0.8.12";
static const bool DevChannel = true;
static const int32 AppVersion = 8013;
static const wchar_t *AppVersionStr = L"0.8.13";
static const bool DevChannel = false;
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
static const wchar_t *AppName = L"Telegram Desktop";

5
Telegram/SourceFiles/gui/text.h
View File

@ -546,10 +546,11 @@ inline bool chIsTrimmed(QChar ch, bool rich = false) {
return (!rich || ch != TextCommand) && (chIsSpace(ch) || chIsBad(ch));
}
inline bool chIsDiac(QChar ch) { // diac and variation selectors
return (ch >= 768 && ch < 880) || (ch >= 7616 && ch < 7680) || (ch >= 8400 && ch < 8448) || (ch >= 65056 && ch < 65072);
QChar::Category c = ch.category();
return (c == QChar::Mark_NonSpacing);
}
inline int32 chMaxDiacAfterSymbol() {
return 4;
return 2;
}
inline bool chIsNewline(QChar ch) {
return (ch == QChar::LineFeed || ch == 156);

2
Telegram/Telegram.plist
View File

@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.8.12</string>
<string>0.8.13</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>

BIN
Telegram/Telegram.rc
View File

Binary file not shown.

12
Telegram/Telegram.xcodeproj/project.pbxproj
View File

@ -1687,7 +1687,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.8.12;
CURRENT_PROJECT_VERSION = 0.8.13;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@ -1705,7 +1705,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.8.12;
CURRENT_PROJECT_VERSION = 0.8.13;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@ -1731,10 +1731,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.8.12;
CURRENT_PROJECT_VERSION = 0.8.13;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.8;
DYLIB_CURRENT_VERSION = 0.8.12;
DYLIB_CURRENT_VERSION = 0.8.13;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@ -1873,10 +1873,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.8.12;
CURRENT_PROJECT_VERSION = 0.8.13;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.8;
DYLIB_CURRENT_VERSION = 0.8.12;
DYLIB_CURRENT_VERSION = 0.8.13;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

2
Telegram/Version.sh
View File

@ -1,2 +1,2 @@
echo 8012 0.8.12 1
echo 8013 0.8.13 0
# AppVersion AppVersionStr DevChannel