From e052a11326a157dcdd96544e031d4b05afdd3b2c Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 26 Mar 2015 12:35:21 +0300 Subject: [PATCH] 0.7.26.dev - some bugs fixed --- Telegram/PrepareWin.bat | 8 ++++---- Telegram/SourceFiles/application.cpp | 6 +++--- Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/profilewidget.cpp | 7 +++++-- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 693090d9a..c957b283c 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 77549ac4d..0293dcc0c 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 8c0a778ee..4dcd0220c 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 3f3ac69c9..3fcdeb956 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 3044d9008..e0fd88f9a 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 144d213b8d284d11d0fa3d7e68a9d2274392b40d..227cc5d614ad14f11c0be1ad9b47f445ad9ab6df 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig_J