diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index 693090d9a6..c957b283c9 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,9 +1,9 @@
@echo OFF
-set "AppVersion=7025"
-set "AppVersionStrSmall=0.7.25"
-set "AppVersionStr=0.7.25"
-set "AppVersionStrFull=0.7.25.0"
+set "AppVersion=7026"
+set "AppVersionStrSmall=0.7.26"
+set "AppVersionStr=0.7.26"
+set "AppVersionStrFull=0.7.26.0"
set "DevChannel=1"
if %DevChannel% neq 0 goto preparedev
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index 77549ac4d8..0293dcc0ce 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -653,9 +653,9 @@ void Application::checkMapVersion() {
psRegisterCustomScheme();
if (Local::oldMapVersion()) {
QString versionFeatures;
- if (DevChannel && Local::oldMapVersion() < 7025) {
- versionFeatures = QString::fromUtf8("\xe2\x80\x94 Add people to groups by username\n\xe2\x80\x94 Copy @username from profile context menu").replace('@', qsl("@") + QChar(0x200D));
- } else if (!DevChannel && Local::oldMapVersion() < 7026) {
+ if (DevChannel && Local::oldMapVersion() < 7026) {
+ versionFeatures = QString::fromUtf8("\xe2\x80\x94 Langs updated, some bugs fixed").replace('@', qsl("@") + QChar(0x200D));
+ } else if (!DevChannel && Local::oldMapVersion() < 8000) {
versionFeatures = lang(lng_new_version7026).trimmed();
}
if (!versionFeatures.isEmpty()) {
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 8c0a778eee..4dcd0220ce 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/
#pragma once
-static const int32 AppVersion = 7025;
-static const wchar_t *AppVersionStr = L"0.7.25";
+static const int32 AppVersion = 7026;
+static const wchar_t *AppVersionStr = L"0.7.26";
static const bool DevChannel = true;
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
diff --git a/Telegram/SourceFiles/profilewidget.cpp b/Telegram/SourceFiles/profilewidget.cpp
index 3f3ac69c96..3fcdeb9567 100644
--- a/Telegram/SourceFiles/profilewidget.cpp
+++ b/Telegram/SourceFiles/profilewidget.cpp
@@ -712,11 +712,13 @@ void ProfileInner::contextMenuEvent(QContextMenuEvent *e) {
_menu->deleteLater();
_menu = 0;
}
- if (!_phoneText.isEmpty()) {
+ if (!_phoneText.isEmpty() || (_peerUser && !_peerUser->username.isEmpty())) {
QRect info(_left + st::profilePhotoSize + st::profilePhoneLeft, st::profilePadding.top(), _width - st::profilePhotoSize - st::profilePhoneLeft, st::profilePhotoSize);
if (info.contains(mapFromGlobal(e->globalPos()))) {
_menu = new ContextMenu(this);
- _menu->addAction(lang(lng_profile_copy_phone), this, SLOT(onCopyPhone()))->setEnabled(true);
+ if (!_phoneText.isEmpty()) {
+ _menu->addAction(lang(lng_profile_copy_phone), this, SLOT(onCopyPhone()))->setEnabled(true);
+ }
if (_peerUser && !_peerUser->username.isEmpty()) {
_menu->addAction(lang(lng_context_copy_mention), this, SLOT(onCopyUsername()))->setEnabled(true);
}
@@ -784,6 +786,7 @@ void ProfileInner::mediaOverviewUpdated(PeerData *peer) {
if (peer == _peer) {
resizeEvent(0);
showAll();
+ update();
}
}
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 3044d9008f..e0fd88f9ac 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.7.25
+ 0.7.26
CFBundleSignature
????
CFBundleURLTypes
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index 144d213b8d..227cc5d614 100644
Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 9ff4cab253..d66c7afb5d 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1667,7 +1667,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.7.25;
+ CURRENT_PROJECT_VERSION = 0.7.26;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1685,7 +1685,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 0.7.25;
+ CURRENT_PROJECT_VERSION = 0.7.26;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1711,10 +1711,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.7.25;
+ CURRENT_PROJECT_VERSION = 0.7.26;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.7;
- DYLIB_CURRENT_VERSION = 0.7.25;
+ DYLIB_CURRENT_VERSION = 0.7.26;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1852,10 +1852,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.7.25;
+ CURRENT_PROJECT_VERSION = 0.7.26;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.7;
- DYLIB_CURRENT_VERSION = 0.7.25;
+ DYLIB_CURRENT_VERSION = 0.7.26;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index 80b43b09ff..fa08464435 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 7025 0.7.25 1
+echo 7026 0.7.26 1
# AppVersion AppVersionStr DevChannel