From 2d46cc4c117dec3a5a03de64b81997481951cfdb Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 11 May 2015 13:18:57 +0300 Subject: [PATCH] preparing version 0.8.13 with new emoji pan --- Telegram/PrepareWin.bat | 10 +++++----- Telegram/Resources/lang.strings | 12 ++++++------ Telegram/SourceFiles/application.cpp | 2 +- Telegram/SourceFiles/config.h | 6 +++--- Telegram/SourceFiles/gui/text.h | 5 +++-- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 9 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index a5562aaf4a..3ade71dc85 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -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 diff --git a/Telegram/Resources/lang.strings b/Telegram/Resources/lang.strings index 3b691a7d58..b0672c0621 100644 --- a/Telegram/Resources/lang.strings +++ b/Telegram/Resources/lang.strings @@ -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"; diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 06c6cf8388..503a54ccaf 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -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()) { diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 31419962ea..6b9a8a14fa 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -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"; diff --git a/Telegram/SourceFiles/gui/text.h b/Telegram/SourceFiles/gui/text.h index 49c44c75d7..ea50274e85 100644 --- a/Telegram/SourceFiles/gui/text.h +++ b/Telegram/SourceFiles/gui/text.h @@ -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); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index b5ab6b4e30..e69787f776 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.12 + 0.8.13 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 85149233b00a75f532e441ca00eb194bf8b69930..1fc61e8867edf404acb46e622e979c7f0835ced2 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig_h