procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

version 0.7.2 - title buttons after forward fixed

This commit is contained in:
John Preston 2014-12-16 22:19:09 +03:00
parent d10715a96c
commit dec5db074c
9 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/PrepareWin.bat
View File

@ -1,8 +1,8 @@
@echo OFF @echo OFF
set "AppVersionStrSmall=0.7.1" set "AppVersionStrSmall=0.7.2"
set "AppVersionStr=0.7.1" set "AppVersionStr=0.7.2"
set "AppVersionStrFull=0.7.1.0" set "AppVersionStrFull=0.7.2.0"
echo. echo.
echo Preparing version %AppVersionStr%.. echo Preparing version %AppVersionStr%..

4
Telegram/SourceFiles/config.h
View File

@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/ */
#pragma once #pragma once
static const int32 AppVersion = 7001; static const int32 AppVersion = 7002;
static const wchar_t *AppVersionStr = L"0.7.1"; static const wchar_t *AppVersionStr = L"0.7.2";
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
static const wchar_t *AppName = L"Telegram Desktop"; static const wchar_t *AppName = L"Telegram Desktop";

1
Telegram/SourceFiles/historywidget.cpp
View File

@ -2312,6 +2312,7 @@ mtpRequestId HistoryWidget::onForward(const PeerId &peer, SelectedItemSet toForw
if (toForward.isEmpty()) return 0; if (toForward.isEmpty()) return 0;
if (toForward.size() == 1) { if (toForward.size() == 1) {
App::main()->clearSelectedItems();
App::main()->showPeer(peer, 0, false, true); App::main()->showPeer(peer, 0, false, true);
if (!hist) return 0; if (!hist) return 0;

1
Telegram/SourceFiles/mainwidget.cpp
View File

@ -1610,6 +1610,7 @@ void MainWidget::sentFullDatasReceived(const MTPmessages_StatedMessages &result)
void MainWidget::forwardDone(PeerId peer, const MTPmessages_StatedMessages &result) { void MainWidget::forwardDone(PeerId peer, const MTPmessages_StatedMessages &result) {
sentFullDatasReceived(result); sentFullDatasReceived(result);
if (hider) hider->forwardDone(); if (hider) hider->forwardDone();
clearSelectedItems();
showPeer(peer, 0, false, true); showPeer(peer, 0, false, true);
history.onClearSelected(); history.onClearSelected();
} }

35
Telegram/SourceFiles/title.cpp
View File

@ -189,29 +189,28 @@ void TitleWidget::updateBackButton() {
if (!cWideMode() && App::main() && App::main()->selectingPeer()) { if (!cWideMode() && App::main() && App::main()->selectingPeer()) {
_cancel.show(); _cancel.show();
if (!_back.isHidden()) _back.hide(); if (!_back.isHidden()) _back.hide();
_settings.hide(); if (!_settings.isHidden()) _settings.hide();
_contacts.hide(); if (!_contacts.isHidden()) _contacts.hide();
_about.hide(); if (!_about.isHidden()) _about.hide();
} else { } else {
_cancel.hide(); if (!_cancel.isHidden()) _cancel.hide();
bool authed = (MTP::authedId() > 0); bool authed = (MTP::authedId() > 0);
if (cWideMode()) { if (cWideMode()) {
if (!_back.isHidden()) _back.hide(); if (!_back.isHidden()) _back.hide();
_settings.show(); if (_settings.isHidden()) _settings.show();
if (authed) _contacts.show(); if (authed && _contacts.isHidden()) _contacts.show();
_about.show(); if (_about.isHidden()) _about.show();
} else { } else {
bool need = App::wnd()->needBackButton(); if (App::wnd()->needBackButton()) {
if (need && _back.isHidden()) { if (_back.isHidden()) _back.show();
_back.show(); if (!_settings.isHidden()) _settings.hide();
_settings.hide(); if (!_contacts.isHidden()) _contacts.hide();
_contacts.hide(); if (!_about.isHidden()) _about.hide();
_about.hide(); } else {
} else if (!need && !_back.isHidden()) { if (!_back.isHidden()) _back.hide();
_back.hide(); if (_settings.isHidden()) _settings.show();
_settings.show(); if (authed && _contacts.isHidden()) _contacts.show();
if (authed) _contacts.show(); if (_about.isHidden()) _about.show();
_about.show();
} }
} }
} }

2
Telegram/Telegram.plist
View File

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

BIN
Telegram/Telegram.rc
View File

Binary file not shown.

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

@ -1577,7 +1577,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.7.1; CURRENT_PROJECT_VERSION = 0.7.2;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@ -1595,7 +1595,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.7.1; CURRENT_PROJECT_VERSION = 0.7.2;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast; GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@ -1621,10 +1621,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.7.1; CURRENT_PROJECT_VERSION = 0.7.2;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.7; DYLIB_COMPATIBILITY_VERSION = 0.7;
DYLIB_CURRENT_VERSION = 0.7.1; DYLIB_CURRENT_VERSION = 0.7.2;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@ -1764,10 +1764,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.7.1; CURRENT_PROJECT_VERSION = 0.7.2;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.7; DYLIB_COMPATIBILITY_VERSION = 0.7;
DYLIB_CURRENT_VERSION = 0.7.1; DYLIB_CURRENT_VERSION = 0.7.2;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

2
Telegram/Version.sh
View File

@ -1,2 +1,2 @@
echo 7001 0.7.1 echo 7002 0.7.2