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

version 0.9 stable prepared

This commit is contained in:
John Preston 2015-09-24 11:58:10 +03:00
parent 1731cfdc38
commit e3e7cf088c
9 changed files with 45 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/BuildWin.bat
View File

@ -1,11 +1,11 @@
@echo OFF @echo OFF
set "AppVersionStrMajor=0.8" set "AppVersionStrMajor=0.9"
set "AppVersion=8059" set "AppVersion=9000"
set "AppVersionStrSmall=0.8.59" set "AppVersionStrSmall=0.9"
set "AppVersionStr=0.8.59" set "AppVersionStr=0.9.0"
set "AppVersionStrFull=0.8.59.0" set "AppVersionStrFull=0.9.0.0"
set "DevChannel=1" set "DevChannel=0"
if %DevChannel% neq 0 goto preparedev if %DevChannel% neq 0 goto preparedev

4
Telegram/SourceFiles/boxes/contactsbox.cpp
View File

@ -1904,7 +1904,7 @@ void MembersBox::resizeEvent(QResizeEvent *e) {
} }
void MembersBox::onLoaded() { void MembersBox::onLoaded() {
if (!_done.isHidden() && _inner.channel()->amCreator() && (_inner.channel()->count < cMaxGroupCount() || !_inner.channel()->isPublic())) { if (!_done.isHidden() && _inner.channel()->amCreator() && (_inner.channel()->count < cMaxGroupCount() || !_inner.channel()->isPublic() || _inner.filter() == MembersFilterAdmins)) {
_add.show(); _add.show();
} }
} }
@ -1944,7 +1944,7 @@ void MembersBox::hideAll() {
void MembersBox::showAll() { void MembersBox::showAll() {
ItemListBox::showAll(); ItemListBox::showAll();
if (_inner.channel()->amCreator() && _inner.isLoaded() && (_inner.channel()->count < cMaxGroupCount() || !_inner.channel()->isPublic())) { if (_inner.channel()->amCreator() && _inner.isLoaded() && (_inner.channel()->count < cMaxGroupCount() || !_inner.channel()->isPublic() || _inner.filter() == MembersFilterAdmins)) {
_add.show(); _add.show();
} else { } else {
_add.hide(); _add.hide();

6
Telegram/SourceFiles/config.h
View File

@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/ */
#pragma once #pragma once
static const int32 AppVersion = 8059; static const int32 AppVersion = 9000;
static const wchar_t *AppVersionStr = L"0.8.59"; static const wchar_t *AppVersionStr = L"0.9";
static const bool DevVersion = true; static const bool DevVersion = false;
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";

54
Telegram/SourceFiles/mainwidget.cpp
View File

@ -767,15 +767,7 @@ bool MainWidget::leaveChatFailed(PeerData *peer, const RPCError &error) {
if (error.type().startsWith(qsl("FLOOD_WAIT_"))) return false; if (error.type().startsWith(qsl("FLOOD_WAIT_"))) return false;
if (error.type() == qstr("USER_NOT_PARTICIPANT") || error.type() == qstr("CHAT_ID_INVALID")) { // left this chat already if (error.type() == qstr("USER_NOT_PARTICIPANT") || error.type() == qstr("CHAT_ID_INVALID")) { // left this chat already
if ((profile && profile->peer() == peer) || (overview && overview->peer() == peer) || _stack.contains(peer) || history.peer() == peer) { deleteConversation(peer);
showDialogs();
}
dialogs.removePeer(peer);
if (History *h = App::historyLoaded(peer->id)) {
h->clear();
h->newLoaded = h->oldLoaded = true;
}
MTP::send(MTPmessages_DeleteHistory(peer->input, MTP_int(0)), rpcDone(&MainWidget::deleteHistoryPart, peer));
return true; return true;
} }
return false; return false;
@ -783,15 +775,7 @@ bool MainWidget::leaveChatFailed(PeerData *peer, const RPCError &error) {
void MainWidget::deleteHistoryAfterLeave(PeerData *peer, const MTPUpdates &updates) { void MainWidget::deleteHistoryAfterLeave(PeerData *peer, const MTPUpdates &updates) {
sentUpdatesReceived(updates); sentUpdatesReceived(updates);
if ((profile && profile->peer() == peer) || (overview && overview->peer() == peer) || _stack.contains(peer) || history.peer() == peer) { deleteConversation(peer);
showDialogs();
}
dialogs.removePeer(peer);
if (History *h = App::historyLoaded(peer->id)) {
h->clear();
h->newLoaded = h->oldLoaded = true;
}
MTP::send(MTPmessages_DeleteHistory(peer->input, MTP_int(0)), rpcDone(&MainWidget::deleteHistoryPart, peer));
} }
void MainWidget::deleteHistoryPart(PeerData *peer, const MTPmessages_AffectedHistory &result) { void MainWidget::deleteHistoryPart(PeerData *peer, const MTPmessages_AffectedHistory &result) {
@ -827,14 +811,25 @@ void MainWidget::deletedContact(UserData *user, const MTPcontacts_Link &result)
App::emitPeerUpdated(); App::emitPeerUpdated();
} }
void MainWidget::deleteConversation(PeerData *peer) { void MainWidget::deleteConversation(PeerData *peer, bool deleteHistory) {
if (activePeer() == peer) {
showDialogs();
}
dialogs.removePeer(peer); dialogs.removePeer(peer);
if (History *h = App::historyLoaded(peer->id)) { if (History *h = App::historyLoaded(peer->id)) {
h->clear(); h->clear();
h->newLoaded = h->oldLoaded = true; h->newLoaded = true;
h->oldLoaded = deleteHistory;
if (h->isChannel()) {
h->asChannelHistory()->clearOther();
}
}
if (peer->isChannel()) {
peer->asChannel()->ptsWaitingForShortPoll(-1);
}
if (deleteHistory) {
MTP::send(MTPmessages_DeleteHistory(peer->input, MTP_int(0)), rpcDone(&MainWidget::deleteHistoryPart, peer));
} }
showDialogs();
MTP::send(MTPmessages_DeleteHistory(peer->input, MTP_int(0)), rpcDone(&MainWidget::deleteHistoryPart, peer));
} }
void MainWidget::clearHistory(PeerData *peer) { void MainWidget::clearHistory(PeerData *peer) {
@ -955,10 +950,7 @@ void MainWidget::checkedHistory(PeerData *peer, const MTPmessages_Messages &resu
if (v->isEmpty()) { if (v->isEmpty()) {
if (peer->isChat() && peer->asChat()->haveLeft) { if (peer->isChat() && peer->asChat()->haveLeft) {
dialogs.removePeer(peer); deleteConversation(peer, false);
if (history.peer() == peer) {
showDialogs();
}
} else if (peer->isChannel()) { } else if (peer->isChannel()) {
if (peer->asChannel()->inviter > 0 && peer->asChannel()->amIn()) { if (peer->asChannel()->inviter > 0 && peer->asChannel()->amIn()) {
if (UserData *from = App::userLoaded(peer->asChannel()->inviter)) { if (UserData *from = App::userLoaded(peer->asChannel()->inviter)) {
@ -4514,15 +4506,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
App::markPeerUpdated(channel); App::markPeerUpdated(channel);
channel->inviter = 0; channel->inviter = 0;
if (!channel->amIn()) { if (!channel->amIn()) {
dialogs.removePeer(channel); deleteConversation(channel, false);
if (History *h = App::historyLoaded(channel->id)) {
h->clear(true);
h->asChannelHistory()->clearOther();
}
channel->ptsWaitingForShortPoll(-1);
if (activePeer() == channel) {
showDialogs();
}
} else if (!channel->amCreator() && App::history(channel->id)) { // create history } else if (!channel->amCreator() && App::history(channel->id)) { // create history
_updatedChannels.insert(channel, true); _updatedChannels.insert(channel, true);
App::api()->requestSelfParticipant(channel); App::api()->requestSelfParticipant(channel);

2
Telegram/SourceFiles/mainwidget.h
View File

@ -289,7 +289,7 @@ public:
void deleteHistoryPart(PeerData *peer, const MTPmessages_AffectedHistory &result); void deleteHistoryPart(PeerData *peer, const MTPmessages_AffectedHistory &result);
void deleteMessages(PeerData *peer, const QVector<MTPint> &ids); void deleteMessages(PeerData *peer, const QVector<MTPint> &ids);
void deletedContact(UserData *user, const MTPcontacts_Link &result); void deletedContact(UserData *user, const MTPcontacts_Link &result);
void deleteConversation(PeerData *peer); void deleteConversation(PeerData *peer, bool deleteHistory = true);
void clearHistory(PeerData *peer); void clearHistory(PeerData *peer);
void removeContact(UserData *user); void removeContact(UserData *user);

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.8.59</string> <string>0.9</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string> <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>

BIN
Telegram/Telegram.rc
View File

Binary file not shown.

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

@ -1697,7 +1697,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.8.59; CURRENT_PROJECT_VERSION = 0.9;
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;
@ -1715,7 +1715,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.8.59; CURRENT_PROJECT_VERSION = 0.9;
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;
@ -1741,10 +1741,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.8.59; CURRENT_PROJECT_VERSION = 0.9;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.8; DYLIB_COMPATIBILITY_VERSION = 0.9;
DYLIB_CURRENT_VERSION = 0.8.59; DYLIB_CURRENT_VERSION = 0.9;
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;
@ -1792,7 +1792,7 @@
"/usr/local/Qt-5.5.0/plugins/imageformats", "/usr/local/Qt-5.5.0/plugins/imageformats",
"./../../Libraries/openssl-xcode", "./../../Libraries/openssl-xcode",
); );
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.8;
OBJROOT = "./../Mac/$(CONFIGURATION)Intermediate"; OBJROOT = "./../Mac/$(CONFIGURATION)Intermediate";
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-pipe", "-pipe",
@ -1875,10 +1875,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.8.59; CURRENT_PROJECT_VERSION = 0.9;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.8; DYLIB_COMPATIBILITY_VERSION = 0.9;
DYLIB_CURRENT_VERSION = 0.8.59; DYLIB_CURRENT_VERSION = 0.9;
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;
@ -1926,7 +1926,7 @@
"/usr/local/Qt-5.5.0/plugins/imageformats", "/usr/local/Qt-5.5.0/plugins/imageformats",
"./../../Libraries/openssl-xcode", "./../../Libraries/openssl-xcode",
); );
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.8;
OBJROOT = "./../Mac/$(CONFIGURATION)Intermediate"; OBJROOT = "./../Mac/$(CONFIGURATION)Intermediate";
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
@ -2003,7 +2003,7 @@
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
LLVM_LTO = YES; LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.8;
OBJROOT = ./../Mac/ReleaseIntermediate; OBJROOT = ./../Mac/ReleaseIntermediate;
QT_LIBRARY_SUFFIX = ""; QT_LIBRARY_SUFFIX = "";
SDKROOT = macosx; SDKROOT = macosx;
@ -2018,7 +2018,7 @@
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.8;
OBJROOT = ./../Mac/DebugIntermediate; OBJROOT = ./../Mac/DebugIntermediate;
QT_LIBRARY_SUFFIX = _debug; QT_LIBRARY_SUFFIX = _debug;
SDKROOT = macosx; SDKROOT = macosx;

2
Telegram/Version.sh
View File

@ -1,2 +1,2 @@
echo 0.8 8059 0.8.59 1 echo 0.9 9000 0.9.0 0
# AppVersionStrMajor AppVersion AppVersionStr DevChannel # AppVersionStrMajor AppVersion AppVersionStr DevChannel