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

channel creation almost done

This commit is contained in:
John Preston 2015-09-16 16:04:08 +03:00
parent 77a92c62f7
commit 41e7ce11a0
36 changed files with 1958 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Telegram/Resources/lang.strings
View File

@ -161,7 +161,6 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
"lng_dlg_filter" = "Search"; "lng_dlg_filter" = "Search";
"lng_dlg_new_group_name" = "Group name"; "lng_dlg_new_group_name" = "Group name";
"lng_dlg_new_channel_name" = "Channel name"; "lng_dlg_new_channel_name" = "Channel name";
"lng_dlg_create_group" = "Create";
"lng_no_contacts" = "You have no contacts"; "lng_no_contacts" = "You have no contacts";
"lng_no_chats" = "Your chats will be here"; "lng_no_chats" = "Your chats will be here";
"lng_contacts_loading" = "Loading.."; "lng_contacts_loading" = "Loading..";
@ -378,7 +377,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
"lng_profile_invite_to_group" = "Add to Group"; "lng_profile_invite_to_group" = "Add to Group";
"lng_profile_delete_contact" = "Delete"; "lng_profile_delete_contact" = "Delete";
"lng_profile_set_group_photo" = "Set Photo"; "lng_profile_set_group_photo" = "Set Photo";
"lng_profile_add_participant" = "Add Member"; "lng_profile_add_participant" = "Add Members";
"lng_profile_delete_and_exit" = "Leave"; "lng_profile_delete_and_exit" = "Leave";
"lng_profile_kick" = "Kick"; "lng_profile_kick" = "Kick";
"lng_profile_sure_kick" = "Kick {user} from the group?"; "lng_profile_sure_kick" = "Kick {user} from the group?";
@ -402,9 +401,28 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
"lng_participant_invite" = "Invite"; "lng_participant_invite" = "Invite";
"lng_create_new_group" = "New Group"; "lng_create_new_group" = "New Group";
"lng_create_new_channel" = "New Channel"; "lng_create_new_channel" = "New Channel";
"lng_create_group_back" = "Back";
"lng_create_group_next" = "Next"; "lng_create_group_next" = "Next";
"lng_create_group_create" = "Create";
"lng_create_group_title" = "New Group"; "lng_create_group_title" = "New Group";
"lng_create_group_about" = "Groups have up to 200 members and are good for smaller communities";
"lng_create_channel_title" = "New Channel"; "lng_create_channel_title" = "New Channel";
"lng_create_channel_about" = "Channels have unlimited number of members and are good for connecting with large audiences";
"lng_create_public_channel_title" = "Public Channel";
"lng_create_public_channel_about" = "Everyone will be able to join your channel";
"lng_create_private_channel_title" = "Private Channel";
"lng_create_private_channel_about" = "Only those who have the invitation link will be able to join your channel";
"lng_create_group_save" = "Save";
"lng_create_group_skip" = "Skip";
"lng_create_channel_link_invalid" = "This link is invalid";
"lng_create_channel_link_occupied" = "This link is already occupied";
"lng_create_channel_link_too_short" = "This link is too short";
"lng_create_channel_link_bad_symbols" = "This link has bad symbols";
"lng_create_channel_link_available" = "This link is available";
"lng_create_group_crop" = "Select square area for group photo";
"lng_create_channel_crop" = "Select square area for channel photo";
"lng_failed_add_participant" = "Could not add user. Try again later."; "lng_failed_add_participant" = "Could not add user. Try again later.";
"lng_failed_add_not_mutual" = "Sorry, if a person left a group, only a\nmutual contact can bring them back\n(they need to have your phone\nnumber, and you need theirs)."; "lng_failed_add_not_mutual" = "Sorry, if a person left a group, only a\nmutual contact can bring them back\n(they need to have your phone\nnumber, and you need theirs).";
@ -435,6 +453,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
"lng_action_changed_title_channel" = "Channel name was changed to «{title}»"; "lng_action_changed_title_channel" = "Channel name was changed to «{title}»";
"lng_action_created_chat" = "{from} created group «{title}»"; "lng_action_created_chat" = "{from} created group «{title}»";
"lng_action_created_channel" = "Channel «{title}» created"; "lng_action_created_channel" = "Channel «{title}» created";
"lng_action_comments_disabled" = "Comments were disabled";
"lng_action_comments_enabled" = "Comments were enabled";
"lng_group_invite_bad_link" = "This invite link is broken\nor 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_want_join" = "Do you want to join the group «{title}»?";
@ -509,6 +529,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
"lng_send_button" = "Send"; "lng_send_button" = "Send";
"lng_message_ph" = "Write a message.."; "lng_message_ph" = "Write a message..";
"lng_comment_ph" = "Write a comment..";
"lng_broadcast_ph" = "Broadcast a message..";
"lng_record_cancel" = "Release outside this field to cancel"; "lng_record_cancel" = "Release outside this field to cancel";
"lng_empty_history" = ""; "lng_empty_history" = "";
"lng_willbe_history" = "Please select a chat to start messaging"; "lng_willbe_history" = "Please select a chat to start messaging";
@ -627,7 +649,10 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
"lng_contacts_header" = "Contacts"; "lng_contacts_header" = "Contacts";
"lng_contact_not_joined" = "Unfortunately {name} did not join Telegram yet, but you can send your friend an invitation.\n\nWe will notify you about any of your contacts who is joining Telegram."; "lng_contact_not_joined" = "Unfortunately {name} did not join Telegram yet, but you can send your friend an invitation.\n\nWe will notify you about any of your contacts who is joining Telegram.";
"lng_try_other_contact" = "Try other"; "lng_try_other_contact" = "Try other";
"lng_contacts_done" = "Cancel"; "lng_contacts_done" = "Close";
"lng_create_group_link" = "Link";
"lng_create_group_photo" = "Set Photo";
"lng_create_group_description" = "Description (optional)";
"lng_drag_images_here" = "Drop images here"; "lng_drag_images_here" = "Drop images here";
"lng_drag_photos_here" = "Drop photos here"; "lng_drag_photos_here" = "Drop photos here";

58
Telegram/Resources/style.txt
View File

@ -1380,15 +1380,57 @@ contactsFilter: flatInput(dlgFilter) {
textMrg: margins(34px, 3px, 5px, 4px); textMrg: margins(34px, 3px, 5px, 4px);
imgPos: point(6px, 7px); imgPos: point(6px, 7px);
} }
newGroupName: flatInput(inpDefGray) {
width: 340px;
height: 44px;
font: font(15px);
textMrg: margins(12px, 5px, 12px, 5px);
}
inpCountry: flatInput(contactsFilter) { inpCountry: flatInput(contactsFilter) {
} }
newGroupName: flatInput(inpDefGray) {
width: 340px;
height: 42px;
font: font(15px);
textMrg: margins(12px, 4px, 12px, 4px);
}
newGroupLink: flatInput(inpDefFlat) {
width: 340px;
height: 42px;
font: font(15px);
textMrg: margins(12px, 4px, 12px, 4px);
bgColor: transparent;
bgActive: transparent;
borderWidth: 2px;
borderColor: #f2f2f2;
borderActive: #80cff9;
borderError: #ed8080;
phColor: #828282;
phFocusColor: #949494;
}
newGroupLimitFg: #a4a4a4;
newGroupAboutFg: #808080;
newGroupNamePadding: margins(12px, 15px, 12px, 13px); newGroupNamePadding: margins(12px, 15px, 12px, 13px);
newGroupPadding: margins(26px, 28px, 26px, 24px);
newGroupSkip: 15px;
newGroupLinkPadding: margins(26px, 27px, 26px, 27px);
newGroupLinkTop: -3px;
newGroupLinkFont: font(16px);
newGroupPhoto: flatButton(btnDefNext, btnDefBig) {
width: 199px;
height: 42px;
textTop: 9px;
overTextTop: 9px;
downTextTop: 10px;
font: font(17px);
overFont: font(17px);
}
newGroupPhotoSize: 96px;
newGroupPhotoSkip: 18px;
newGroupDescriptionSkip: 28px;
newGroupDescription: flatTextarea(taDefFlat) {
font: font(15px);
bgColor: transparent;
phColor: #828282;
phFocusColor: #949494;
}
newGroupDescriptionPadding: margins(5px, 6px, 5px, 6px);
connectionSkip: 20px; connectionSkip: 20px;
inpConnectionHost: flatInput(inpDefGray) { inpConnectionHost: flatInput(inpDefGray) {
@ -1546,10 +1588,6 @@ dragPadding: margins(20px, 10px, 20px, 10px);
dragHeight: 72px; dragHeight: 72px;
selectedFont: font(fsize);
selectedColor: #777;
selectedTop: 14px;
downloadSkip: 20px; downloadSkip: 20px;
inpDownloadDir: flatInput(inpDefGray) { inpDownloadDir: flatInput(inpDefGray) {
font: font(fsize); font: font(fsize);

4
Telegram/SourceFiles/boxes/addcontactbox.h
View File

@ -30,6 +30,10 @@ public:
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e);
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e);
void setInnerFocus() {
_firstInput.setFocus();
}
public slots: public slots:
void onSend(); void onSend();

2
Telegram/SourceFiles/boxes/backgroundbox.cpp
View File

@ -172,7 +172,7 @@ void BackgroundInner::resizeEvent(QResizeEvent *e) {
} }
BackgroundBox::BackgroundBox() : ItemListBox(st::boxScroll), _inner(), BackgroundBox::BackgroundBox() : ItemListBox(st::boxScroll), _inner(),
_close(this, lang(lng_contacts_done), st::contactsClose) { _close(this, lang(lng_cancel), st::contactsClose) {
init(&_inner, _close.height(), st::boxFont->height + st::newGroupNamePadding.top() + st::newGroupNamePadding.bottom()); init(&_inner, _close.height(), st::boxFont->height + st::newGroupNamePadding.top() + st::newGroupNamePadding.bottom());

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

File diff suppressed because it is too large Load Diff

177
Telegram/SourceFiles/boxes/contactsbox.h
View File

@ -19,6 +19,12 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
#include "abstractbox.h" #include "abstractbox.h"
enum CreatingGroupType {
CreatingGroupNone,
CreatingGroupGroup,
CreatingGroupChannel,
};
class ContactsInner : public QWidget, public RPCSender { class ContactsInner : public QWidget, public RPCSender {
Q_OBJECT Q_OBJECT
@ -28,7 +34,8 @@ private:
public: public:
ContactsInner(bool creatingChat); ContactsInner(CreatingGroupType creating = CreatingGroupNone);
ContactsInner(ChannelData *channel);
ContactsInner(ChatData *chat); ContactsInner(ChatData *chat);
ContactsInner(UserData *bot); ContactsInner(UserData *bot);
void init(); void init();
@ -60,8 +67,11 @@ public:
void refresh(); void refresh();
ChatData *chat() const; ChatData *chat() const;
ChannelData *channel() const;
UserData *bot() const; UserData *bot() const;
bool creatingChat() const; CreatingGroupType creating() const;
int32 selectedCount() const;
~ContactsInner(); ~ContactsInner();
@ -70,6 +80,7 @@ signals:
void mustScrollTo(int ymin, int ymax); void mustScrollTo(int ymin, int ymax);
void selectAllQuery(); void selectAllQuery();
void searchByUsername(); void searchByUsername();
void chosenChanged();
public slots: public slots:
@ -84,8 +95,9 @@ public slots:
private: private:
ChatData *_chat; ChatData *_chat;
ChannelData *_channel;
UserData *_bot; UserData *_bot;
bool _creatingChat; CreatingGroupType _creating;
ChatData *_addToChat; ChatData *_addToChat;
@ -133,22 +145,29 @@ class ContactsBox : public ItemListBox, public RPCSender {
public: public:
ContactsBox(bool creatingChat = false); ContactsBox();
ContactsBox(const QString &name, const QImage &photo); // group creation
ContactsBox(ChannelData *channel); // channel setup
ContactsBox(ChatData *chat); ContactsBox(ChatData *chat);
ContactsBox(UserData *bot); ContactsBox(UserData *bot);
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e);
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e);
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e);
void closePressed();
void setInnerFocus() {
_filter.setFocus();
}
public slots: public slots:
void onFilterUpdate(); void onFilterUpdate();
void onScroll(); void onScroll();
void onAdd(); void onAdd();
void onCreateChannel();
void onInvite(); void onInvite();
void onNext(); void onCreate();
bool onSearchByUsername(bool searchCache = false); bool onSearchByUsername(bool searchCache = false);
void onNeedSearchByUsername(); void onNeedSearchByUsername();
@ -164,7 +183,7 @@ private:
void init(); void init();
ContactsInner _inner; ContactsInner _inner;
FlatButton _addContact, _createChannel; FlatButton _addContact;
FlatInput _filter; FlatInput _filter;
FlatButton _next, _cancel; FlatButton _next, _cancel;
@ -172,8 +191,6 @@ private:
void peopleReceived(const MTPcontacts_Found &result, mtpRequestId req); void peopleReceived(const MTPcontacts_Found &result, mtpRequestId req);
bool peopleFailed(const RPCError &error, mtpRequestId req); bool peopleFailed(const RPCError &error, mtpRequestId req);
bool _creatingChannel;
QTimer _searchTimer; QTimer _searchTimer;
QString _peopleQuery; QString _peopleQuery;
bool _peopleFull; bool _peopleFull;
@ -184,21 +201,29 @@ private:
typedef QMap<mtpRequestId, QString> PeopleQueries; typedef QMap<mtpRequestId, QString> PeopleQueries;
PeopleQueries _peopleQueries; PeopleQueries _peopleQueries;
// group creation
int32 _creationRequestId;
QString _creationName;
QImage _creationPhoto;
void creationDone(const MTPUpdates &updates);
bool creationFail(const RPCError &e);
}; };
class CreateGroupBox : public AbstractBox, public RPCSender { class NewGroupBox : public AbstractBox {
Q_OBJECT Q_OBJECT
public: public:
CreateGroupBox(const MTPVector<MTPInputUser> &users, bool creatingChannel); NewGroupBox();
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e);
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e);
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e);
public slots: public slots:
void onCreate(); void onNext();
protected: protected:
@ -208,14 +233,130 @@ protected:
private: private:
void created(const MTPUpdates &updates); FlatRadiobutton _group, _channel;
bool failed(const RPCError &e); int32 _aboutGroupWidth, _aboutGroupHeight;
Text _aboutGroup, _aboutChannel;
FlatButton _next, _cancel;
MTPVector<MTPInputUser> _users; };
bool _creatingChannel;
int32 _createRequestId; class GroupInfoBox : public AbstractBox, public RPCSender {
Q_OBJECT
public:
GroupInfoBox(CreatingGroupType creating);
void keyPressEvent(QKeyEvent *e);
void paintEvent(QPaintEvent *e);
void resizeEvent(QResizeEvent *e);
void mouseMoveEvent(QMouseEvent *e);
void mousePressEvent(QMouseEvent *e);
void leaveEvent(QEvent *e);
bool eventFilter(QObject *obj, QEvent *e);
bool descriptionAnimStep(float64 ms);
bool photoAnimStep(float64 ms);
void setInnerFocus() {
_name.setFocus();
}
public slots:
void onPhoto();
void onPhotoReady(const QImage &img);
void onNext();
void onDescriptionResized();
protected:
void hideAll();
void showAll();
void showDone();
private:
QRect descriptionRect() const;
QRect photoRect() const;
void updateMaxHeight();
void updateSelected(const QPoint &cursorGlobalPosition);
CreatingGroupType _creating;
anim::fvalue a_photoOver;
Animation a_photo;
bool _photoOver, _descriptionOver;
anim::cvalue a_descriptionBg, a_descriptionBorder;
Animation a_description;
FlatInput _name; FlatInput _name;
FlatButton _create, _cancel; FlatButton _photo;
FlatTextarea _description;
QImage _photoBig;
QPixmap _photoSmall;
FlatButton _next, _cancel;
// channel creation
int32 _creationRequestId;
ChannelData *_createdChannel;
void creationDone(const MTPUpdates &updates);
bool creationFail(const RPCError &e);
void exportDone(const MTPExportedChatInvite &result);
};
class SetupChannelBox : public AbstractBox, public RPCSender {
Q_OBJECT
public:
SetupChannelBox(ChannelData *channel);
void keyPressEvent(QKeyEvent *e);
void paintEvent(QPaintEvent *e);
void resizeEvent(QResizeEvent *e);
void closePressed();
void setInnerFocus() {
_link.setFocus();
}
public slots:
void onSave();
void onChange();
void onCheck();
void onPrivacyChange();
protected:
void hideAll();
void showAll();
void showDone();
private:
ChannelData *_channel;
FlatRadiobutton _public, _private;
int32 _aboutPublicWidth, _aboutPublicHeight;
Text _aboutPublic, _aboutPrivate;
QString _linkPlaceholder;
UsernameInput _link;
FlatButton _save, _skip;
void onUpdateDone(const MTPBool &result);
bool onUpdateFail(const RPCError &error);
void onCheckDone(const MTPBool &result);
bool onCheckFail(const RPCError &error);
mtpRequestId _saveRequestId, _checkRequestId;
QString _sentUsername, _checkUsername, _errorText, _goodText;
QTimer _checkTimer;
}; };

16
Telegram/SourceFiles/boxes/photocropbox.cpp
View File

@ -24,14 +24,22 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
#include "photocropbox.h" #include "photocropbox.h"
#include "fileuploader.h" #include "fileuploader.h"
PhotoCropBox::PhotoCropBox(const QImage &img, const PeerId &peer) : _downState(0), PhotoCropBox::PhotoCropBox(const QImage &img, const PeerId &peer, bool upload) : _downState(0),
_sendButton(this, lang(lng_settings_save), st::btnSelectDone), _sendButton(this, lang(lng_settings_save), st::btnSelectDone),
_cancelButton(this, lang(lng_cancel), st::btnSelectCancel), _cancelButton(this, lang(lng_cancel), st::btnSelectCancel),
_img(img), _peerId(peer) { _img(img), _peerId(peer) {
if (peerIsChannel(_peerId)) {
_title = lang(lng_create_channel_crop);
} else if (peerIsChat(_peerId)) {
_title = lang(lng_create_group_crop);
} else {
_title = lang(lng_settings_crop_profile);
}
connect(&_sendButton, SIGNAL(clicked()), this, SLOT(onSend())); connect(&_sendButton, SIGNAL(clicked()), this, SLOT(onSend()));
connect(&_cancelButton, SIGNAL(clicked()), this, SLOT(onClose())); connect(&_cancelButton, SIGNAL(clicked()), this, SLOT(onClose()));
if (_peerId) { if (_peerId && upload) {
connect(this, SIGNAL(ready(const QImage &)), this, SLOT(onReady(const QImage &))); connect(this, SIGNAL(ready(const QImage &)), this, SLOT(onReady(const QImage &)));
} }
@ -209,7 +217,7 @@ void PhotoCropBox::paintEvent(QPaintEvent *e) {
// paint button sep // paint button sep
p.fillRect(st::btnSelectCancel.width, height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b); p.fillRect(st::btnSelectCancel.width, height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
paintGrayTitle(p, lang(lng_settings_crop_profile)); paintGrayTitle(p, _title);
p.translate(_thumbx, _thumby); p.translate(_thumbx, _thumby);
p.drawPixmap(0, 0, _thumb); p.drawPixmap(0, 0, _thumb);
@ -269,11 +277,11 @@ void PhotoCropBox::onSend() {
} }
emit ready(tosend); emit ready(tosend);
onClose();
} }
void PhotoCropBox::onReady(const QImage &tosend) { void PhotoCropBox::onReady(const QImage &tosend) {
App::app()->uploadProfilePhoto(tosend, _peerId); App::app()->uploadProfilePhoto(tosend, _peerId);
emit closed();
} }
void PhotoCropBox::hideAll() { void PhotoCropBox::hideAll() {

3
Telegram/SourceFiles/boxes/photocropbox.h
View File

@ -24,7 +24,7 @@ class PhotoCropBox : public AbstractBox {
public: public:
PhotoCropBox(const QImage &img, const PeerId &peer); PhotoCropBox(const QImage &img, const PeerId &peer, bool upload = true);
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e);
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e);
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e);
@ -50,6 +50,7 @@ protected:
private: private:
QString _title;
int32 _downState; int32 _downState;
int32 _thumbx, _thumby, _thumbw, _thumbh; int32 _thumbx, _thumby, _thumbw, _thumbh;
int32 _cropx, _cropy, _cropw; int32 _cropx, _cropy, _cropw;

34
Telegram/SourceFiles/boxes/usernamebox.cpp
View File

@ -23,34 +23,6 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
#include "mainwidget.h" #include "mainwidget.h"
#include "window.h" #include "window.h"
UsernameInput::UsernameInput(QWidget *parent, const style::flatInput &st, const QString &ph, const QString &val) : FlatInput(parent, st, ph, val) {
}
void UsernameInput::correctValue(QKeyEvent *e, const QString &was) {
QString oldText(text()), newText;
int32 newPos = cursorPosition(), from, len = oldText.size();
for (from = 0; from < len; ++from) {
if (!oldText.at(from).isSpace()) {
break;
}
if (newPos > 0) --newPos;
}
len -= from;
if (len > MaxUsernameLength) len = MaxUsernameLength + (oldText.at(from) == '@' ? 1 : 0);
for (int32 to = from + len; to > from;) {
--to;
if (!oldText.at(to).isSpace()) {
break;
}
--len;
}
newText = oldText.mid(from, len);
if (newText != oldText) {
setText(newText);
setCursorPosition(newPos);
}
}
UsernameBox::UsernameBox() : UsernameBox::UsernameBox() :
_saveButton(this, lang(lng_settings_save), st::usernameDone), _saveButton(this, lang(lng_settings_save), st::usernameDone),
_cancelButton(this, lang(lng_cancel), st::usernameCancel), _cancelButton(this, lang(lng_cancel), st::usernameCancel),
@ -146,7 +118,7 @@ void UsernameBox::onCheck() {
} }
QString name = getName(); QString name = getName();
if (name.size() >= MinUsernameLength) { if (name.size() >= MinUsernameLength) {
_checkUsername = getName(); _checkUsername = name;
_checkRequest = MTP::send(MTPaccount_CheckUsername(MTP_string(name)), rpcDone(&UsernameBox::onCheckDone), rpcFail(&UsernameBox::onCheckFail)); _checkRequest = MTP::send(MTPaccount_CheckUsername(MTP_string(name)), rpcDone(&UsernameBox::onCheckDone), rpcFail(&UsernameBox::onCheckFail));
} }
} }
@ -197,9 +169,9 @@ bool UsernameBox::onUpdateFail(const RPCError &error) {
if (error.type().startsWith(qsl("FLOOD_WAIT_"))) return false; if (error.type().startsWith(qsl("FLOOD_WAIT_"))) return false;
_saveRequest = 0; _saveRequest = 0;
QString err(error.type()), name = getName(); QString err(error.type());
if (err == "USERNAME_NOT_MODIFIED" || _sentUsername == App::self()->username) { if (err == "USERNAME_NOT_MODIFIED" || _sentUsername == App::self()->username) {
App::self()->setName(textOneLine(App::self()->firstName), textOneLine(App::self()->lastName), textOneLine(App::self()->nameOrPhone), textOneLine(name)); App::self()->setName(textOneLine(App::self()->firstName), textOneLine(App::self()->lastName), textOneLine(App::self()->nameOrPhone), textOneLine(_sentUsername));
emit closed(); emit closed();
return true; return true;
} else if (err == "USERNAME_INVALID") { } else if (err == "USERNAME_INVALID") {

11
Telegram/SourceFiles/boxes/usernamebox.h
View File

@ -19,17 +19,6 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
#include "abstractbox.h" #include "abstractbox.h"
class UsernameInput : public FlatInput {
public:
UsernameInput(QWidget *parent, const style::flatInput &st, const QString &ph = QString(), const QString &val = QString());
protected:
void correctValue(QKeyEvent *e, const QString &was);
};
class UsernameBox : public AbstractBox, public RPCSender { class UsernameBox : public AbstractBox, public RPCSender {
Q_OBJECT Q_OBJECT

2
Telegram/SourceFiles/dialogswidget.cpp
View File

@ -2203,7 +2203,7 @@ void DialogsWidget::onAddContact() {
} }
void DialogsWidget::onNewGroup() { void DialogsWidget::onNewGroup() {
App::wnd()->showLayer(new ContactsBox(true)); App::wnd()->showLayer(new NewGroupBox());
} }
bool DialogsWidget::onCancelSearch() { bool DialogsWidget::onCancelSearch() {

32
Telegram/SourceFiles/gui/flatinput.cpp
View File

@ -74,6 +74,10 @@ void FlatInput::customUpDown(bool custom) {
_customUpDown = custom; _customUpDown = custom;
} }
void FlatInput::setTextMargin(const QMargins &mrg) {
_st.textMrg = mrg;
}
void FlatInput::onTouchTimer() { void FlatInput::onTouchTimer() {
_touchRightButton = true; _touchRightButton = true;
} }
@ -383,6 +387,34 @@ void CountryCodeInput::correctValue(QKeyEvent *e, const QString &was) {
} }
} }
UsernameInput::UsernameInput(QWidget *parent, const style::flatInput &st, const QString &ph, const QString &val) : FlatInput(parent, st, ph, val) {
}
void UsernameInput::correctValue(QKeyEvent *e, const QString &was) {
QString oldText(text()), newText;
int32 newPos = cursorPosition(), from, len = oldText.size();
for (from = 0; from < len; ++from) {
if (!oldText.at(from).isSpace()) {
break;
}
if (newPos > 0) --newPos;
}
len -= from;
if (len > MaxUsernameLength) len = MaxUsernameLength + (oldText.at(from) == '@' ? 1 : 0);
for (int32 to = from + len; to > from;) {
--to;
if (!oldText.at(to).isSpace()) {
break;
}
--len;
}
newText = oldText.mid(from, len);
if (newText != oldText) {
setText(newText);
setCursorPosition(newPos);
}
}
InputField::InputField(QWidget *parent, const style::InputField &st, const QString &ph, const QString &val) : TWidget(parent), InputField::InputField(QWidget *parent, const style::InputField &st, const QString &ph, const QString &val) : TWidget(parent),
_inner(this, val), _inner(this, val),
_oldtext(val), _oldtext(val),

15
Telegram/SourceFiles/gui/flatinput.h
View File

@ -23,6 +23,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
class FlatInput : public QLineEdit, public Animated { class FlatInput : public QLineEdit, public Animated {
Q_OBJECT Q_OBJECT
T_WIDGET
public: public:
@ -56,6 +57,8 @@ public:
return text(); return text();
} }
void setTextMargin(const QMargins &mrg);
public slots: public slots:
void onTextChange(const QString &text); void onTextChange(const QString &text);
@ -131,6 +134,18 @@ private:
}; };
class UsernameInput : public FlatInput {
public:
UsernameInput(QWidget *parent, const style::flatInput &st, const QString &ph = QString(), const QString &val = QString());
protected:
void correctValue(QKeyEvent *e, const QString &was);
};
class InputField : public TWidget { class InputField : public TWidget {
Q_OBJECT Q_OBJECT

47
Telegram/SourceFiles/gui/flattextarea.cpp
View File

@ -22,10 +22,11 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
#include "window.h" #include "window.h"
FlatTextarea::FlatTextarea(QWidget *parent, const style::flatTextarea &st, const QString &pholder, const QString &v) : QTextEdit(v, parent), FlatTextarea::FlatTextarea(QWidget *parent, const style::flatTextarea &st, const QString &pholder, const QString &v) : QTextEdit(v, parent),
_ph(pholder), _oldtext(v), _phVisible(!v.length()), _minHeight(-1), _maxHeight(-1), _ctrlEnterSubmit(true),
a_phLeft(_phVisible ? 0 : st.phShift), a_phAlpha(_phVisible ? 1 : 0), a_phColor(st.phColor->c), _ph(pholder), _oldtext(v), _phVisible(!v.length()),
_st(st), _undoAvailable(false), _redoAvailable(false), _inDrop(false), _fakeMargin(0), a_phLeft(_phVisible ? 0 : st.phShift), a_phAlpha(_phVisible ? 1 : 0), a_phColor(st.phColor->c),
_touchPress(false), _touchRightButton(false), _touchMove(false), _replacingEmojis(false) { _st(st), _undoAvailable(false), _redoAvailable(false), _inDrop(false), _fakeMargin(0),
_touchPress(false), _touchRightButton(false), _touchMove(false), _replacingEmojis(false) {
setAcceptRichText(false); setAcceptRichText(false);
resize(_st.width, _st.font->height); resize(_st.width, _st.font->height);
@ -64,6 +65,31 @@ FlatTextarea::FlatTextarea(QWidget *parent, const style::flatTextarea &st, const
if (App::wnd()) connect(this, SIGNAL(selectionChanged()), App::wnd(), SLOT(updateGlobalMenu())); if (App::wnd()) connect(this, SIGNAL(selectionChanged()), App::wnd(), SLOT(updateGlobalMenu()));
} }
void FlatTextarea::setMinHeight(int32 minHeight) {
_minHeight = minHeight;
heightAutoupdated();
}
void FlatTextarea::setMaxHeight(int32 maxHeight) {
_maxHeight = maxHeight;
heightAutoupdated();
}
bool FlatTextarea::heightAutoupdated() {
if (_minHeight < 0 || _maxHeight < 0) return false;
int newh = ceil(document()->size().height()) + 2 * fakeMargin();
if (newh > _maxHeight) {
newh = _maxHeight;
} else if (newh < _minHeight) {
newh = _minHeight;
}
if (height() != newh) {
resize(width(), newh);
return true;
}
return false;
}
void FlatTextarea::onTouchTimer() { void FlatTextarea::onTouchTimer() {
_touchRightButton = true; _touchRightButton = true;
} }
@ -555,6 +581,12 @@ QVariant FlatTextarea::loadResource(int type, const QUrl &name) {
return QVariant(); return QVariant();
} }
void FlatTextarea::checkContentHeight() {
if (heightAutoupdated()) {
emit resized();
}
}
void FlatTextarea::processDocumentContentsChange(int position, int charsAdded) { void FlatTextarea::processDocumentContentsChange(int position, int charsAdded) {
int32 emojiPosition = 0, emojiLen = 0; int32 emojiPosition = 0, emojiLen = 0;
const EmojiData *emoji = 0; const EmojiData *emoji = 0;
@ -693,6 +725,7 @@ void FlatTextarea::onDocumentContentsChanged() {
if (_oldtext != curText) { if (_oldtext != curText) {
_oldtext = curText; _oldtext = curText;
emit changed(); emit changed();
checkContentHeight();
} }
updatePlaceholder(); updatePlaceholder();
if (App::wnd()) App::wnd()->updateGlobalMenu(); if (App::wnd()) App::wnd()->updateGlobalMenu();
@ -753,10 +786,14 @@ QMimeData *FlatTextarea::createMimeDataFromSelection() const {
return result; return result;
} }
void FlatTextarea::setCtrlEnterSubmit(bool ctrlEnterSubmit) {
_ctrlEnterSubmit = ctrlEnterSubmit;
}
void FlatTextarea::keyPressEvent(QKeyEvent *e) { void FlatTextarea::keyPressEvent(QKeyEvent *e) {
bool shift = e->modifiers().testFlag(Qt::ShiftModifier); bool shift = e->modifiers().testFlag(Qt::ShiftModifier);
bool macmeta = (cPlatform() == dbipMac) && e->modifiers().testFlag(Qt::ControlModifier) && !e->modifiers().testFlag(Qt::MetaModifier) && !e->modifiers().testFlag(Qt::AltModifier); bool macmeta = (cPlatform() == dbipMac) && e->modifiers().testFlag(Qt::ControlModifier) && !e->modifiers().testFlag(Qt::MetaModifier) && !e->modifiers().testFlag(Qt::AltModifier);
bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier), ctrlGood = (ctrl && cCtrlEnter()) || (!ctrl && !shift && !cCtrlEnter()) || (ctrl && shift); bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier), ctrlGood = (ctrl && _ctrlEnterSubmit) || (!ctrl && !shift && !_ctrlEnterSubmit) || (ctrl && shift);
bool enter = (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return); bool enter = (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return);
if (macmeta && e->key() == Qt::Key_Backspace) { if (macmeta && e->key() == Qt::Key_Backspace) {

28
Telegram/SourceFiles/gui/flattextarea.h
View File

@ -23,6 +23,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
class FlatTextarea : public QTextEdit, public Animated { class FlatTextarea : public QTextEdit, public Animated {
Q_OBJECT Q_OBJECT
T_WIDGET
public: public:
@ -38,6 +39,9 @@ public:
void mousePressEvent(QMouseEvent *e); void mousePressEvent(QMouseEvent *e);
void dropEvent(QDropEvent *e); void dropEvent(QDropEvent *e);
void setMinHeight(int32 minHeight);
void setMaxHeight(int32 maxHeight);
const QString &getLastText() const; const QString &getLastText() const;
void updatePlaceholder(); void updatePlaceholder();
@ -64,6 +68,7 @@ public:
void insertFromMimeData(const QMimeData *source); void insertFromMimeData(const QMimeData *source);
QMimeData *createMimeDataFromSelection() const; QMimeData *createMimeDataFromSelection() const;
void setCtrlEnterSubmit(bool ctrlEnterSubmit);
public slots: public slots:
@ -79,6 +84,7 @@ public slots:
signals: signals:
void resized();
void changed(); void changed();
void submitted(bool ctrlShiftEnter); void submitted(bool ctrlShiftEnter);
void cancelled(); void cancelled();
@ -89,29 +95,19 @@ signals:
protected: protected:
void insertEmoji(EmojiPtr emoji, QTextCursor c); void insertEmoji(EmojiPtr emoji, QTextCursor c);
TWidget *tparent() {
return qobject_cast<TWidget*>(parentWidget());
}
const TWidget *tparent() const {
return qobject_cast<const TWidget*>(parentWidget());
}
void enterEvent(QEvent *e) {
TWidget *p(tparent());
if (p) p->leaveToChildEvent(e);
return QTextEdit::enterEvent(e);
}
void leaveEvent(QEvent *e) {
TWidget *p(tparent());
if (p) p->enterFromChildEvent(e);
return QTextEdit::leaveEvent(e);
}
QVariant loadResource(int type, const QUrl &name); QVariant loadResource(int type, const QUrl &name);
void checkContentHeight();
private: private:
void getSingleEmojiFragment(QString &text, QTextFragment &fragment) const; void getSingleEmojiFragment(QString &text, QTextFragment &fragment) const;
void processDocumentContentsChange(int position, int charsAdded); void processDocumentContentsChange(int position, int charsAdded);
bool heightAutoupdated();
int32 _minHeight, _maxHeight; // < 0 - no autosize
bool _ctrlEnterSubmit;
QString _ph, _phelided, _oldtext; QString _ph, _phelided, _oldtext;
bool _phVisible; bool _phVisible;

122
Telegram/SourceFiles/gui/twidget.h
View File

@ -26,6 +26,37 @@ public:
explicit Painter(QPaintDevice *device) : QPainter(device) { explicit Painter(QPaintDevice *device) : QPainter(device) {
} }
void setFont(const style::font &font) {
QPainter::setFont(font->f);
}
void setFont(const QFont &font) {
QPainter::setFont(font);
}
void setBrush(const style::color &color) {
QPainter::setBrush(color->b);
}
void setBrush(const QColor &color) {
QPainter::setBrush(color);
}
void setBrush(const QBrush &brush) {
QPainter::setBrush(brush);
}
void setBrush(Qt::BrushStyle style) {
QPainter::setBrush(style);
}
void setPen(const style::color &color) {
QPainter::setPen(color->p);
}
void setPen(const QPen &pen) {
QPainter::setPen(pen);
}
void setPen(const QColor &color) {
QPainter::setPen(color);
}
void setPen(Qt::PenStyle style) {
QPainter::setPen(style);
}
void drawTextLeft(int x, int y, int outerw, const QString &text, int textWidth = -1) { void drawTextLeft(int x, int y, int outerw, const QString &text, int textWidth = -1) {
QFontMetrics m(fontMetrics()); QFontMetrics m(fontMetrics());
if (rtl() && textWidth < 0) textWidth = m.width(text); if (rtl() && textWidth < 0) textWidth = m.width(text);
@ -113,63 +144,62 @@ public:
} }
}; };
#define T_WIDGET public: \
TWidget *tparent() { \
return qobject_cast<TWidget*>(parentWidget()); \
} \
const TWidget *tparent() const { \
return qobject_cast<const TWidget*>(parentWidget()); \
} \
virtual void leaveToChildEvent(QEvent *e) { /* e -- from enterEvent() of child TWidget */ \
} \
virtual void enterFromChildEvent(QEvent *e) { /* e -- from leaveEvent() of child TWidget */ \
} \
void moveToLeft(int x, int y, int outerw) { \
move(rtl() ? (outerw - x - width()) : x, y); \
} \
void moveToRight(int x, int y, int outerw) { \
move(rtl() ? x : (outerw - x - width()), y); \
} \
QPoint myrtlpoint(int x, int y) const { \
return rtlpoint(x, y, width()); \
} \
QPoint myrtlpoint(const QPoint p) const { \
return rtlpoint(p, width()); \
} \
QRect myrtlrect(int x, int y, int w, int h) const { \
return rtlrect(x, y, w, h, width()); \
} \
QRect myrtlrect(const QRect &r) { \
return rtlrect(r, width()); \
} \
void rtlupdate(const QRect &r) { \
update(myrtlrect(r)); \
} \
protected: \
void enterEvent(QEvent *e) { \
TWidget *p(tparent()); \
if (p) p->leaveToChildEvent(e); \
return QWidget::enterEvent(e); \
} \
void leaveEvent(QEvent *e) { \
TWidget *p(tparent()); \
if (p) p->enterFromChildEvent(e); \
return QWidget::leaveEvent(e); \
}
class TWidget : public QWidget { class TWidget : public QWidget {
Q_OBJECT Q_OBJECT
T_WIDGET
public: public:
TWidget(QWidget *parent = 0) : QWidget(parent) { TWidget(QWidget *parent = 0) : QWidget(parent) {
} }
TWidget *tparent() {
return qobject_cast<TWidget*>(parentWidget());
}
const TWidget *tparent() const {
return qobject_cast<const TWidget*>(parentWidget());
}
virtual void leaveToChildEvent(QEvent *e) { // e -- from enterEvent() of child TWidget
}
virtual void enterFromChildEvent(QEvent *e) { // e -- from leaveEvent() of child TWidget
}
void moveToLeft(int x, int y, int outerw) {
move(rtl() ? (outerw - x - width()) : x, y);
}
void moveToRight(int x, int y, int outerw) {
move(rtl() ? x : (outerw - x - width()), y);
}
QPoint myrtlpoint(int x, int y) const {
return rtlpoint(x, y, width());
}
QPoint myrtlpoint(const QPoint p) const {
return rtlpoint(p, width());
}
QRect myrtlrect(int x, int y, int w, int h) const {
return rtlrect(x, y, w, h, width());
}
QRect myrtlrect(const QRect &r) {
return rtlrect(r, width());
}
void rtlupdate(const QRect &r) {
update(myrtlrect(r));
}
bool event(QEvent *e) { bool event(QEvent *e) {
return QWidget::event(e); return QWidget::event(e);
} }
protected:
void enterEvent(QEvent *e) {
TWidget *p(tparent());
if (p) p->leaveToChildEvent(e);
return QWidget::enterEvent(e);
}
void leaveEvent(QEvent *e) {
TWidget *p(tparent());
if (p) p->enterFromChildEvent(e);
return QWidget::leaveEvent(e);
}
private: private:
}; };

7
Telegram/SourceFiles/history.cpp
View File

@ -1461,7 +1461,7 @@ bool History::isReadyFor(MsgId msgId, bool check) const {
void History::getReadyFor(MsgId msgId) { void History::getReadyFor(MsgId msgId) {
if (!isReadyFor(msgId, true)) { if (!isReadyFor(msgId, true)) {
clear(true); clear(true);
newLoaded = (msgId == ShowAtTheEndMsgId) || (lastMsg && !lastMsg->detached()); newLoaded = (msgId == ShowAtTheEndMsgId);
oldLoaded = false; oldLoaded = false;
lastWidth = 0; lastWidth = 0;
lastShowAtMsgId = msgId; lastShowAtMsgId = msgId;
@ -6386,6 +6386,11 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) {
text = lng_action_created_channel(lt_title, textClean(qs(d.vtitle))); text = lng_action_created_channel(lt_title, textClean(qs(d.vtitle)));
} break; } break;
case mtpc_messageActionChannelToggleComments: {
const MTPDmessageActionChannelToggleComments &d(action.c_messageActionChannelToggleComments());
text = lang(d.venabled.v ? lng_action_comments_enabled : lng_action_comments_disabled);
} break;
case mtpc_messageActionChatDeletePhoto: { case mtpc_messageActionChatDeletePhoto: {
text = fromChannel() ? lang(lng_action_removed_photo_channel) : lng_action_removed_photo(lt_from, from); text = fromChannel() ? lang(lng_action_removed_photo_channel) : lng_action_removed_photo(lt_from, from);
} break; } break;

55
Telegram/SourceFiles/historywidget.cpp
View File

@ -695,7 +695,7 @@ void HistoryList::dragActionFinish(const QPoint &screenPos, Qt::MouseButton butt
uint32 sel = _selected.cbegin().value(); uint32 sel = _selected.cbegin().value();
if (sel != FullItemSel && (sel & 0xFFFF) == ((sel >> 16) & 0xFFFF)) { if (sel != FullItemSel && (sel & 0xFFFF) == ((sel >> 16) & 0xFFFF)) {
_selected.clear(); _selected.clear();
App::wnd()->setInnerFocus(); if (App::wnd()) App::wnd()->setInnerFocus();
} }
} }
} }
@ -1577,21 +1577,9 @@ void HistoryList::onParentGeometryChanged() {
} }
} }
MessageField::MessageField(HistoryWidget *history, const style::flatTextarea &st, const QString &ph, const QString &val) : FlatTextarea(history, st, ph, val), history(history), _maxHeight(st::maxFieldHeight) { MessageField::MessageField(HistoryWidget *history, const style::flatTextarea &st, const QString &ph, const QString &val) : FlatTextarea(history, st, ph, val), history(history) {
connect(this, SIGNAL(changed()), this, SLOT(onChange())); setMinHeight(st::btnSend.height - 2 * st::sendPadding);
} setMaxHeight(st::maxFieldHeight);
void MessageField::setMaxHeight(int32 maxHeight) {
_maxHeight = maxHeight;
int newh = ceil(document()->size().height()) + 2 * fakeMargin(), minh = st::btnSend.height - 2 * st::sendPadding;
if (newh > _maxHeight) {
newh = _maxHeight;
} else if (newh < minh) {
newh = minh;
}
if (height() != newh) {
resize(width(), newh);
}
} }
bool MessageField::hasSendText() const { bool MessageField::hasSendText() const {
@ -1605,20 +1593,6 @@ bool MessageField::hasSendText() const {
return false; return false;
} }
void MessageField::onChange() {
int newh = ceil(document()->size().height()) + 2 * fakeMargin(), minh = st::btnSend.height - 2 * st::sendPadding;
if (newh > _maxHeight) {
newh = _maxHeight;
} else if (newh < minh) {
newh = minh;
}
if (height() != newh) {
resize(width(), newh);
emit resized();
}
}
void MessageField::onEmojiInsert(EmojiPtr emoji) { void MessageField::onEmojiInsert(EmojiPtr emoji) {
insertEmoji(emoji, textCursor()); insertEmoji(emoji, textCursor());
} }
@ -1632,7 +1606,7 @@ void MessageField::dropEvent(QDropEvent *e) {
void MessageField::resizeEvent(QResizeEvent *e) { void MessageField::resizeEvent(QResizeEvent *e) {
FlatTextarea::resizeEvent(e); FlatTextarea::resizeEvent(e);
onChange(); checkContentHeight();
} }
bool MessageField::canInsertFromMimeData(const QMimeData *source) const { bool MessageField::canInsertFromMimeData(const QMimeData *source) const {
@ -2396,6 +2370,7 @@ HistoryWidget::HistoryWidget(QWidget *parent) : TWidget(parent)
_attachMention.hide(); _attachMention.hide();
connect(&_attachMention, SIGNAL(chosen(QString)), this, SLOT(onMentionHashtagOrBotCommandInsert(QString))); connect(&_attachMention, SIGNAL(chosen(QString)), this, SLOT(onMentionHashtagOrBotCommandInsert(QString)));
_field.installEventFilter(&_attachMention); _field.installEventFilter(&_attachMention);
_field.setCtrlEnterSubmit(cCtrlEnter());
_field.hide(); _field.hide();
_field.resize(width() - _send.width() - _attachDocument.width() - _attachEmoji.width(), _send.height() - 2 * st::sendPadding); _field.resize(width() - _send.width() - _attachDocument.width() - _attachEmoji.width(), _send.height() - 2 * st::sendPadding);
@ -2580,7 +2555,7 @@ void HistoryWidget::sendActionDone(const MTPBool &result, mtpRequestId req) {
void HistoryWidget::activate() { void HistoryWidget::activate() {
if (_history) updateListSize(0, true); if (_history) updateListSize(0, true);
setInnerFocus(); if (App::wnd()) App::wnd()->setInnerFocus();
} }
void HistoryWidget::setInnerFocus() { void HistoryWidget::setInnerFocus() {
@ -2935,7 +2910,7 @@ void HistoryWidget::showPeerHistory(const PeerId &peerId, MsgId showAtMsgId) {
if (_history->draftToId > 0 || !_history->draft.isEmpty()) { if (_history->draftToId > 0 || !_history->draft.isEmpty()) {
setFieldText(_history->draft); setFieldText(_history->draft);
setInnerFocus(); _field.setFocus();
_history->draftCursor.applyTo(_field, &_synthedTextUpdate); _history->draftCursor.applyTo(_field, &_synthedTextUpdate);
_replyToId = readyToForward() ? 0 : _history->draftToId; _replyToId = readyToForward() ? 0 : _history->draftToId;
if (_history->draftPreviewCancelled) { if (_history->draftPreviewCancelled) {
@ -2944,7 +2919,7 @@ void HistoryWidget::showPeerHistory(const PeerId &peerId, MsgId showAtMsgId) {
} else { } else {
Local::MessageDraft draft = Local::readDraft(_peer->id); Local::MessageDraft draft = Local::readDraft(_peer->id);
setFieldText(draft.text); setFieldText(draft.text);
setInnerFocus(); _field.setFocus();
if (!draft.text.isEmpty()) { if (!draft.text.isEmpty()) {
MessageCursor cur = Local::readDraftPositions(_peer->id); MessageCursor cur = Local::readDraftPositions(_peer->id);
cur.applyTo(_field, &_synthedTextUpdate); cur.applyTo(_field, &_synthedTextUpdate);
@ -2969,6 +2944,8 @@ void HistoryWidget::showPeerHistory(const PeerId &peerId, MsgId showAtMsgId) {
doneShow(); doneShow();
} }
if (App::wnd()) App::wnd()->setInnerFocus();
emit peerShown(_peer); emit peerShown(_peer);
App::main()->topBar()->update(); App::main()->topBar()->update();
update(); update();
@ -3000,6 +2977,10 @@ void HistoryWidget::updateAfterDrag() {
if (_list) _list->dragActionUpdate(QCursor::pos()); if (_list) _list->dragActionUpdate(QCursor::pos());
} }
void HistoryWidget::ctrlEnterSubmitUpdated() {
_field.setCtrlEnterSubmit(cCtrlEnter());
}
void HistoryWidget::updateReportSpamStatus() { void HistoryWidget::updateReportSpamStatus() {
if (!_peer || (_peer->isUser() && (peerToUser(_peer->id) == MTP::authedId() || isNotificationsUser(_peer->id) || isServiceUser(_peer->id) || _peer->asUser()->botInfo))) { if (!_peer || (_peer->isUser() && (peerToUser(_peer->id) == MTP::authedId() || isNotificationsUser(_peer->id) || isServiceUser(_peer->id) || _peer->asUser()->botInfo))) {
_reportSpamStatus = dbiprsNoButton; _reportSpamStatus = dbiprsNoButton;
@ -3447,7 +3428,7 @@ void HistoryWidget::loadMessagesDown() {
MsgId max = _history->maxMsgId(); MsgId max = _history->maxMsgId();
if (!max) return; if (!max) return;
int32 loadCount = MessagesPerPage, offset = -loadCount - 1; int32 loadCount = MessagesPerPage, offset = -loadCount;
if (_peer->isChannel()) { if (_peer->isChannel()) {
_preloadDownRequest = MTP::send(MTPmessages_GetImportantHistory(_peer->input, MTP_int(max + 1), MTP_int(offset), MTP_int(loadCount), MTP_int(0), MTP_int(0)), rpcDone(&HistoryWidget::messagesReceived, _peer), rpcFail(&HistoryWidget::messagesFailed)); _preloadDownRequest = MTP::send(MTPmessages_GetImportantHistory(_peer->input, MTP_int(max + 1), MTP_int(offset), MTP_int(loadCount), MTP_int(0), MTP_int(0)), rpcDone(&HistoryWidget::messagesReceived, _peer), rpcFail(&HistoryWidget::messagesFailed));
} else { } else {
@ -3745,8 +3726,10 @@ void HistoryWidget::doneShow() {
updateControlsVisibility(); updateControlsVisibility();
updateListSize(0, true); updateListSize(0, true);
onListScroll(); onListScroll();
if (App::wnd()) App::wnd()->checkHistoryActivation(); if (App::wnd()) {
App::wnd()->checkHistoryActivation();
App::wnd()->setInnerFocus(); App::wnd()->setInnerFocus();
}
} }
void HistoryWidget::animStop() { void HistoryWidget::animStop() {

8
Telegram/SourceFiles/historywidget.h
View File

@ -190,7 +190,6 @@ public:
void insertFromMimeData(const QMimeData *source); void insertFromMimeData(const QMimeData *source);
void focusInEvent(QFocusEvent *e); void focusInEvent(QFocusEvent *e);
void setMaxHeight(int32 maxHeight);
bool hasSendText() const; bool hasSendText() const;
@ -206,17 +205,14 @@ public:
public slots: public slots:
void onChange();
void onEmojiInsert(EmojiPtr emoji); void onEmojiInsert(EmojiPtr emoji);
signals: signals:
void resized();
void focused(); void focused();
private: private:
HistoryWidget *history; HistoryWidget *history;
int32 _maxHeight;
}; };
@ -520,6 +516,9 @@ public:
void updateToEndVisibility(); void updateToEndVisibility();
void updateAfterDrag(); void updateAfterDrag();
void ctrlEnterSubmitUpdated();
void setInnerFocus();
~HistoryWidget(); ~HistoryWidget();
@ -585,7 +584,6 @@ public slots:
void onPhotoFailed(quint64 id); void onPhotoFailed(quint64 id);
void activate(); void activate();
void setInnerFocus();
void onMentionHashtagOrBotCommandInsert(QString str); void onMentionHashtagOrBotCommandInsert(QString str);
void onTextChange(); void onTextChange();

4
Telegram/SourceFiles/intro/introsignup.cpp
View File

@ -207,8 +207,8 @@ void IntroSignup::onCheckRequest() {
void IntroSignup::onPhotoReady(const QImage &img) { void IntroSignup::onPhotoReady(const QImage &img) {
_photoBig = img; _photoBig = img;
_photoSmall = QPixmap::fromImage(img.scaled(st::introPhotoSize, st::introPhotoSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), Qt::ColorOnly); _photoSmall = QPixmap::fromImage(img.scaled(st::introPhotoSize * cIntRetinaFactor(), st::introPhotoSize * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation), Qt::ColorOnly);
App::wnd()->hideLayer(); _photoSmall.setDevicePixelRatio(cRetinaFactor());
} }
void IntroSignup::nameSubmitDone(const MTPauth_Authorization &result) { void IntroSignup::nameSubmitDone(const MTPauth_Authorization &result) {

37
Telegram/SourceFiles/layerwidget.cpp
View File

@ -24,7 +24,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
#include "mainwidget.h" #include "mainwidget.h"
#include "gui/filedialog.h" #include "gui/filedialog.h"
BackgroundWidget::BackgroundWidget(QWidget *parent, LayeredWidget *w) : QWidget(parent), w(w), _hidden(0), BackgroundWidget::BackgroundWidget(QWidget *parent, LayeredWidget *w) : QWidget(parent), w(w),
aBackground(0), aBackgroundFunc(anim::easeOutCirc), hiding(false), shadow(st::boxShadow) { aBackground(0), aBackgroundFunc(anim::easeOutCirc), hiding(false), shadow(st::boxShadow) {
w->setParent(this); w->setParent(this);
setGeometry(0, 0, App::wnd()->width(), App::wnd()->height()); setGeometry(0, 0, App::wnd()->width(), App::wnd()->height());
@ -72,13 +72,13 @@ void BackgroundWidget::onClose() {
} }
bool BackgroundWidget::onInnerClose() { bool BackgroundWidget::onInnerClose() {
if (!_hidden) { if (_hidden.isEmpty()) {
onClose(); onClose();
return true; return true;
} }
w->deleteLater(); w->deleteLater();
w = _hidden; w = _hidden.back();
_hidden = 0; _hidden.pop_back();
w->show(); w->show();
resizeEvent(0); resizeEvent(0);
w->animStep(1); w->animStep(1);
@ -87,13 +87,24 @@ bool BackgroundWidget::onInnerClose() {
} }
void BackgroundWidget::startHide() { void BackgroundWidget::startHide() {
if (App::main()) App::main()->setInnerFocus(); if (hiding) return;
hiding = true; hiding = true;
if (App::wnd()) App::wnd()->setInnerFocus();
aBackground.start(0); aBackground.start(0);
anim::start(this); anim::start(this);
w->startHide(); w->startHide();
} }
bool BackgroundWidget::canSetFocus() const {
return w && !hiding;
}
void BackgroundWidget::setInnerFocus() {
if (w) {
w->setInnerFocus();
}
}
void BackgroundWidget::resizeEvent(QResizeEvent *e) { void BackgroundWidget::resizeEvent(QResizeEvent *e) {
w->parentResized(); w->parentResized();
} }
@ -103,9 +114,8 @@ void BackgroundWidget::updateWideMode() {
} }
void BackgroundWidget::replaceInner(LayeredWidget *n) { void BackgroundWidget::replaceInner(LayeredWidget *n) {
if (_hidden) _hidden->deleteLater(); _hidden.push_back(w);
_hidden = w; w->hide();
_hidden->hide();
w = n; w = n;
w->setParent(this); w->setParent(this);
connect(w, SIGNAL(closed()), this, SLOT(onInnerClose())); connect(w, SIGNAL(closed()), this, SLOT(onInnerClose()));
@ -139,13 +149,18 @@ void BackgroundWidget::boxDestroyed(QObject *obj) {
if (obj == w) { if (obj == w) {
if (App::wnd()) App::wnd()->layerFinishedHide(this); if (App::wnd()) App::wnd()->layerFinishedHide(this);
w = 0; w = 0;
} else if (_hidden == obj) { } else {
_hidden = 0; int32 index = _hidden.indexOf(static_cast<LayeredWidget*>(obj));
if (index >= 0) {
_hidden.removeAt(index);
}
} }
} }
BackgroundWidget::~BackgroundWidget() { BackgroundWidget::~BackgroundWidget() {
if (App::wnd()) App::wnd()->noBox(this); if (App::wnd()) App::wnd()->noBox(this);
w->deleteLater(); w->deleteLater();
if (_hidden) _hidden->deleteLater(); for (HiddenLayers::const_iterator i = _hidden.cbegin(), e = _hidden.cend(); i != e; ++i) {
(*i)->deleteLater();
}
} }

11
Telegram/SourceFiles/layerwidget.h
View File

@ -30,6 +30,10 @@ public:
virtual void startHide() { virtual void startHide() {
} }
virtual void setInnerFocus() {
setFocus();
}
virtual void resizeEvent(QResizeEvent *e) { virtual void resizeEvent(QResizeEvent *e) {
emit resized(); emit resized();
} }
@ -71,6 +75,9 @@ public:
bool animStep(float64 ms); bool animStep(float64 ms);
bool canSetFocus() const;
void setInnerFocus();
~BackgroundWidget(); ~BackgroundWidget();
public slots: public slots:
@ -83,7 +90,9 @@ private:
void startHide(); void startHide();
LayeredWidget *w, *_hidden; LayeredWidget *w;
typedef QList<LayeredWidget*> HiddenLayers;
HiddenLayers _hidden;
anim::fvalue aBackground; anim::fvalue aBackground;
anim::transition aBackgroundFunc; anim::transition aBackgroundFunc;
bool hiding; bool hiding;

1
Telegram/SourceFiles/localstorage.cpp
View File

@ -958,6 +958,7 @@ namespace {
if (!_checkStreamStatus(stream)) return false; if (!_checkStreamStatus(stream)) return false;
cSetCtrlEnter(v == dbiskCtrlEnter); cSetCtrlEnter(v == dbiskCtrlEnter);
if (App::main()) App::main()->ctrlEnterSubmitUpdated();
} break; } break;
case dbiCatsAndDogs: { // deprecated case dbiCatsAndDogs: { // deprecated

24
Telegram/SourceFiles/mainwidget.cpp
View File

@ -831,12 +831,14 @@ void MainWidget::removeContact(UserData *user) {
dialogs.removeContact(user); dialogs.removeContact(user);
} }
void MainWidget::addParticipants(ChatData *chat, const QVector<UserData*> &users) { void MainWidget::addParticipants(PeerData *chatOrChannel, const QVector<UserData*> &users) {
for (QVector<UserData*>::const_iterator i = users.cbegin(), e = users.cend(); i != e; ++i) { for (QVector<UserData*>::const_iterator i = users.cbegin(), e = users.cend(); i != e; ++i) {
MTP::send(MTPmessages_AddChatUser(chat->inputChat, (*i)->inputUser, MTP_int(ForwardOnAdd)), rpcDone(&MainWidget::sentUpdatesReceived), rpcFail(&MainWidget::addParticipantFail, *i), 0, 5); if (chatOrChannel->isChat()) {
MTP::send(MTPmessages_AddChatUser(chatOrChannel->asChat()->inputChat, (*i)->inputUser, MTP_int(ForwardOnAdd)), rpcDone(&MainWidget::sentUpdatesReceived), rpcFail(&MainWidget::addParticipantFail, *i), 0, 5);
} else if (chatOrChannel->isChannel()) {
MTP::send(MTPmessages_AddChatUser(chatOrChannel->asChannel()->inputChat, (*i)->inputUser, MTP_int(0)), rpcDone(&MainWidget::sentUpdatesReceived), rpcFail(&MainWidget::addParticipantFail, *i), 0, 5);
}
} }
App::wnd()->hideLayer();
showPeerHistory(chat->id, ShowAtTheEndMsgId);
} }
bool MainWidget::addParticipantFail(UserData *user, const RPCError &error) { bool MainWidget::addParticipantFail(UserData *user, const RPCError &error) {
@ -971,7 +973,7 @@ void MainWidget::onResendAsDocument() {
item->destroy(); item->destroy();
} }
} }
App::wnd()->layerHidden(); App::wnd()->hideLayer(true);
} }
void MainWidget::onCancelResend() { void MainWidget::onCancelResend() {
@ -2087,7 +2089,7 @@ void MainWidget::setInnerFocus() {
} else if (profile) { } else if (profile) {
profile->setFocus(); profile->setFocus();
} else { } else {
history.activate(); history.setInnerFocus();
} }
} }
@ -2121,6 +2123,10 @@ void MainWidget::updateAfterDrag() {
} }
} }
void MainWidget::ctrlEnterSubmitUpdated() {
history.ctrlEnterSubmitUpdated();
}
void MainWidget::showPeerHistory(quint64 peerId, qint32 showAtMsgId, bool back) { void MainWidget::showPeerHistory(quint64 peerId, qint32 showAtMsgId, bool back) {
if (!back && (!peerId || (_stack.size() == 1 && _stack[0]->type() == HistoryStackItem && _stack[0]->peer->id == peerId))) { if (!back && (!peerId || (_stack.size() == 1 && _stack[0]->type() == HistoryStackItem && _stack[0]->peer->id == peerId))) {
back = true; back = true;
@ -2197,8 +2203,8 @@ void MainWidget::showPeerHistory(quint64 peerId, qint32 showAtMsgId, bool back)
if (history.isHidden()) history.show(); if (history.isHidden()) history.show();
if (!animCache.isNull()) { if (!animCache.isNull()) {
history.animShow(animCache, animTopBarCache, back); history.animShow(animCache, animTopBarCache, back);
} else { } else if (App::wnd()) {
QTimer::singleShot(0, this, SLOT(setInnerFocus())); QTimer::singleShot(0, App::wnd(), SLOT(setInnerFocus()));
} }
} }
} }
@ -2381,7 +2387,7 @@ void MainWidget::showBackFromStack() {
if (selectingPeer()) return; if (selectingPeer()) return;
if (_stack.isEmpty()) { if (_stack.isEmpty()) {
showDialogs(); showDialogs();
QTimer::singleShot(0, this, SLOT(setInnerFocus())); if (App::wnd()) QTimer::singleShot(0, App::wnd(), SLOT(setInnerFocus()));
return; return;
} }
StackItem *item = _stack.back(); StackItem *item = _stack.back();

6
Telegram/SourceFiles/mainwidget.h
View File

@ -291,7 +291,7 @@ public:
void clearHistory(PeerData *peer); void clearHistory(PeerData *peer);
void removeContact(UserData *user); void removeContact(UserData *user);
void addParticipants(ChatData *chat, const QVector<UserData*> &users); void addParticipants(PeerData *chatOrChannel, const QVector<UserData*> &users);
bool addParticipantFail(UserData *user, const RPCError &e); bool addParticipantFail(UserData *user, const RPCError &e);
void kickParticipant(ChatData *chat, UserData *user); void kickParticipant(ChatData *chat, UserData *user);
@ -385,6 +385,9 @@ public:
void feedUpdate(const MTPUpdate &update); void feedUpdate(const MTPUpdate &update);
void updateAfterDrag(); void updateAfterDrag();
void ctrlEnterSubmitUpdated();
void setInnerFocus();
~MainWidget(); ~MainWidget();
signals: signals:
@ -414,7 +417,6 @@ public slots:
void documentPlayProgress(const SongMsgId &songId); void documentPlayProgress(const SongMsgId &songId);
void hidePlayer(); void hidePlayer();
void setInnerFocus();
void dialogsCancelled(); void dialogsCancelled();
void onParentResize(const QSize &newSize); void onParentResize(const QSize &newSize);

4
Telegram/SourceFiles/mediaview.cpp
View File

@ -412,7 +412,9 @@ void MediaView::showSaveMsgFile() {
} }
void MediaView::close() { void MediaView::close() {
if (App::wnd()) App::wnd()->layerHidden(); if (App::wnd()) {
App::wnd()->hideLayer(true);
}
} }
void MediaView::activateControls() { void MediaView::activateControls() {

110
Telegram/SourceFiles/mtproto/mtpScheme.cpp
View File

@ -1671,6 +1671,19 @@ void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpP
} }
break; break;
case mtpc_messageActionChannelToggleComments:
if (stage) {
to.add(",\n").addSpaces(lev);
} else {
to.add("{ messageActionChannelToggleComments");
to.add("\n").addSpaces(lev);
}
switch (stage) {
case 0: to.add(" enabled: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
}
break;
case mtpc_dialog: case mtpc_dialog:
if (stage) { if (stage) {
to.add(",\n").addSpaces(lev); to.add(",\n").addSpaces(lev);
@ -4728,6 +4741,69 @@ void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpP
} }
break; break;
case mtpc_channelParticipantModerator:
if (stage) {
to.add(",\n").addSpaces(lev);
} else {
to.add("{ channelParticipantModerator");
to.add("\n").addSpaces(lev);
}
switch (stage) {
case 0: to.add(" user_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 1: to.add(" inviter_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 2: to.add(" date: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
}
break;
case mtpc_channelParticipantPublisher:
if (stage) {
to.add(",\n").addSpaces(lev);
} else {
to.add("{ channelParticipantPublisher");
to.add("\n").addSpaces(lev);
}
switch (stage) {
case 0: to.add(" user_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 1: to.add(" inviter_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 2: to.add(" date: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
}
break;
case mtpc_channelParticipantCreator:
if (stage) {
to.add(",\n").addSpaces(lev);
} else {
to.add("{ channelParticipantCreator");
to.add("\n").addSpaces(lev);
}
switch (stage) {
case 0: to.add(" user_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
}
break;
case mtpc_channelParticipantsRecent:
to.add("{ channelParticipantsRecent }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back();
break;
case mtpc_channelParticipantsAdmins:
to.add("{ channelParticipantsAdmins }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back();
break;
case mtpc_channelRoleEmpty:
to.add("{ channelRoleEmpty }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back();
break;
case mtpc_channelRoleModerator:
to.add("{ channelRoleModerator }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back();
break;
case mtpc_channelRolePublisher:
to.add("{ channelRolePublisher }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back();
break;
case mtpc_messages_channelParticipants: case mtpc_messages_channelParticipants:
if (stage) { if (stage) {
to.add(",\n").addSpaces(lev); to.add(",\n").addSpaces(lev);
@ -5257,6 +5333,21 @@ void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpP
} }
break; break;
case mtpc_messages_editChatAdmin:
if (stage) {
to.add(",\n").addSpaces(lev);
} else {
to.add("{ messages_editChatAdmin");
to.add("\n").addSpaces(lev);
}
switch (stage) {
case 0: to.add(" chat_id: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 1: to.add(" user_id: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 2: to.add(" role: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
}
break;
case mtpc_messages_checkChannelUsername: case mtpc_messages_checkChannelUsername:
if (stage) { if (stage) {
to.add(",\n").addSpaces(lev); to.add(",\n").addSpaces(lev);
@ -6211,6 +6302,20 @@ void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpP
} }
break; break;
case mtpc_messages_toggleChannelComments:
if (stage) {
to.add(",\n").addSpaces(lev);
} else {
to.add("{ messages_toggleChannelComments");
to.add("\n").addSpaces(lev);
}
switch (stage) {
case 0: to.add(" chat_id: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 1: to.add(" enabled: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
}
break;
case mtpc_messages_getChats: case mtpc_messages_getChats:
if (stage) { if (stage) {
to.add(",\n").addSpaces(lev); to.add(",\n").addSpaces(lev);
@ -6441,8 +6546,9 @@ void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpP
} }
switch (stage) { switch (stage) {
case 0: to.add(" chat_id: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 0: to.add(" chat_id: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 1: to.add(" offset: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 1: to.add(" filter: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 2: to.add(" limit: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 2: to.add(" offset: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 3: to.add(" limit: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
} }
break; break;

466
Telegram/SourceFiles/mtproto/mtpScheme.h
View File

@ -167,6 +167,7 @@ enum {
mtpc_messageActionChatDeleteUser = 0xb2ae9b0c, mtpc_messageActionChatDeleteUser = 0xb2ae9b0c,
mtpc_messageActionChatJoinedByLink = 0xf89cf5e8, mtpc_messageActionChatJoinedByLink = 0xf89cf5e8,
mtpc_messageActionChannelCreate = 0x95d2ac92, mtpc_messageActionChannelCreate = 0x95d2ac92,
mtpc_messageActionChannelToggleComments = 0xf2863903,
mtpc_dialog = 0xc1dd804a, mtpc_dialog = 0xc1dd804a,
mtpc_dialogChannel = 0x5b8496b2, mtpc_dialogChannel = 0x5b8496b2,
mtpc_photoEmpty = 0x2331b22d, mtpc_photoEmpty = 0x2331b22d,
@ -412,6 +413,14 @@ enum {
mtpc_channelMessagesFilterCollapsed = 0xfa01232e, mtpc_channelMessagesFilterCollapsed = 0xfa01232e,
mtpc_contacts_resolvedPeer = 0x7f077ad9, mtpc_contacts_resolvedPeer = 0x7f077ad9,
mtpc_channelParticipant = 0x506116ea, mtpc_channelParticipant = 0x506116ea,
mtpc_channelParticipantModerator = 0x91057fef,
mtpc_channelParticipantPublisher = 0x375d616,
mtpc_channelParticipantCreator = 0xe3e2e1f9,
mtpc_channelParticipantsRecent = 0xde3f3c79,
mtpc_channelParticipantsAdmins = 0xb4608969,
mtpc_channelRoleEmpty = 0xb285a0c6,
mtpc_channelRoleModerator = 0x9618d975,
mtpc_channelRolePublisher = 0x515b5530,
mtpc_messages_channelParticipants = 0xd6891de1, mtpc_messages_channelParticipants = 0xd6891de1,
mtpc_invokeAfterMsg = 0xcb9f372d, mtpc_invokeAfterMsg = 0xcb9f372d,
mtpc_invokeAfterMsgs = 0x3dc4b4f0, mtpc_invokeAfterMsgs = 0x3dc4b4f0,
@ -519,12 +528,14 @@ enum {
mtpc_messages_getImportantHistory = 0x24af43a5, mtpc_messages_getImportantHistory = 0x24af43a5,
mtpc_messages_readChannelHistory = 0x36a1210e, mtpc_messages_readChannelHistory = 0x36a1210e,
mtpc_messages_createChannel = 0x7f44d2c3, mtpc_messages_createChannel = 0x7f44d2c3,
mtpc_messages_toggleChannelComments = 0xb405b8af,
mtpc_messages_deleteChannelMessages = 0x9995a84f, mtpc_messages_deleteChannelMessages = 0x9995a84f,
mtpc_messages_getChannelMessages = 0x5f46b265, mtpc_messages_getChannelMessages = 0x5f46b265,
mtpc_messages_incrementMessagesViews = 0x91ffd479, mtpc_messages_incrementMessagesViews = 0x91ffd479,
mtpc_messages_getMessagesViews = 0x9abfbbe1, mtpc_messages_getMessagesViews = 0x9abfbbe1,
mtpc_messages_editChatAbout = 0x8a969b93, mtpc_messages_editChatAbout = 0x8a969b93,
mtpc_messages_getChannelParticipants = 0x4a771976, mtpc_messages_getChannelParticipants = 0x38a1db31,
mtpc_messages_editChatAdmin = 0x62394070,
mtpc_messages_checkChannelUsername = 0xe6d2d8f4, mtpc_messages_checkChannelUsername = 0xe6d2d8f4,
mtpc_messages_updateChannelUsername = 0xce2e9587, mtpc_messages_updateChannelUsername = 0xce2e9587,
mtpc_updates_getState = 0xedd4882a, mtpc_updates_getState = 0xedd4882a,
@ -744,6 +755,7 @@ class MTPDmessageActionChatAddUser;
class MTPDmessageActionChatDeleteUser; class MTPDmessageActionChatDeleteUser;
class MTPDmessageActionChatJoinedByLink; class MTPDmessageActionChatJoinedByLink;
class MTPDmessageActionChannelCreate; class MTPDmessageActionChannelCreate;
class MTPDmessageActionChannelToggleComments;
class MTPdialog; class MTPdialog;
class MTPDdialog; class MTPDdialog;
@ -1131,6 +1143,13 @@ class MTPDcontacts_resolvedPeer;
class MTPchannelParticipant; class MTPchannelParticipant;
class MTPDchannelParticipant; class MTPDchannelParticipant;
class MTPDchannelParticipantModerator;
class MTPDchannelParticipantPublisher;
class MTPDchannelParticipantCreator;
class MTPchannelParticipantsFilter;
class MTPchannelParticipantRole;
class MTPmessages_channelParticipants; class MTPmessages_channelParticipants;
class MTPDmessages_channelParticipants; class MTPDmessages_channelParticipants;
@ -1286,6 +1305,8 @@ typedef MTPBoxed<MTPupdates_channelDifference> MTPupdates_ChannelDifference;
typedef MTPBoxed<MTPchannelMessagesFilter> MTPChannelMessagesFilter; typedef MTPBoxed<MTPchannelMessagesFilter> MTPChannelMessagesFilter;
typedef MTPBoxed<MTPcontacts_resolvedPeer> MTPcontacts_ResolvedPeer; typedef MTPBoxed<MTPcontacts_resolvedPeer> MTPcontacts_ResolvedPeer;
typedef MTPBoxed<MTPchannelParticipant> MTPChannelParticipant; typedef MTPBoxed<MTPchannelParticipant> MTPChannelParticipant;
typedef MTPBoxed<MTPchannelParticipantsFilter> MTPChannelParticipantsFilter;
typedef MTPBoxed<MTPchannelParticipantRole> MTPChannelParticipantRole;
typedef MTPBoxed<MTPmessages_channelParticipants> MTPmessages_ChannelParticipants; typedef MTPBoxed<MTPmessages_channelParticipants> MTPmessages_ChannelParticipants;
// Type classes definitions // Type classes definitions
@ -3702,6 +3723,18 @@ public:
return *(const MTPDmessageActionChannelCreate*)data; return *(const MTPDmessageActionChannelCreate*)data;
} }
MTPDmessageActionChannelToggleComments &_messageActionChannelToggleComments() {
if (!data) throw mtpErrorUninitialized();
if (_type != mtpc_messageActionChannelToggleComments) throw mtpErrorWrongTypeId(_type, mtpc_messageActionChannelToggleComments);
split();
return *(MTPDmessageActionChannelToggleComments*)data;
}
const MTPDmessageActionChannelToggleComments &c_messageActionChannelToggleComments() const {
if (!data) throw mtpErrorUninitialized();
if (_type != mtpc_messageActionChannelToggleComments) throw mtpErrorWrongTypeId(_type, mtpc_messageActionChannelToggleComments);
return *(const MTPDmessageActionChannelToggleComments*)data;
}
uint32 innerLength() const; uint32 innerLength() const;
mtpTypeId type() const; mtpTypeId type() const;
void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons); void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons);
@ -3718,6 +3751,7 @@ private:
explicit MTPmessageAction(MTPDmessageActionChatDeleteUser *_data); explicit MTPmessageAction(MTPDmessageActionChatDeleteUser *_data);
explicit MTPmessageAction(MTPDmessageActionChatJoinedByLink *_data); explicit MTPmessageAction(MTPDmessageActionChatJoinedByLink *_data);
explicit MTPmessageAction(MTPDmessageActionChannelCreate *_data); explicit MTPmessageAction(MTPDmessageActionChannelCreate *_data);
explicit MTPmessageAction(MTPDmessageActionChannelToggleComments *_data);
friend MTPmessageAction MTP_messageActionEmpty(); friend MTPmessageAction MTP_messageActionEmpty();
friend MTPmessageAction MTP_messageActionChatCreate(const MTPstring &_title, const MTPVector<MTPint> &_users); friend MTPmessageAction MTP_messageActionChatCreate(const MTPstring &_title, const MTPVector<MTPint> &_users);
@ -3728,6 +3762,7 @@ private:
friend MTPmessageAction MTP_messageActionChatDeleteUser(MTPint _user_id); friend MTPmessageAction MTP_messageActionChatDeleteUser(MTPint _user_id);
friend MTPmessageAction MTP_messageActionChatJoinedByLink(MTPint _inviter_id); friend MTPmessageAction MTP_messageActionChatJoinedByLink(MTPint _inviter_id);
friend MTPmessageAction MTP_messageActionChannelCreate(const MTPstring &_title); friend MTPmessageAction MTP_messageActionChannelCreate(const MTPstring &_title);
friend MTPmessageAction MTP_messageActionChannelToggleComments(MTPBool _enabled);
mtpTypeId _type; mtpTypeId _type;
}; };
@ -8392,35 +8427,134 @@ typedef MTPBoxed<MTPcontacts_resolvedPeer> MTPcontacts_ResolvedPeer;
class MTPchannelParticipant : private mtpDataOwner { class MTPchannelParticipant : private mtpDataOwner {
public: public:
MTPchannelParticipant(); MTPchannelParticipant() : mtpDataOwner(0), _type(0) {
MTPchannelParticipant(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_channelParticipant) : mtpDataOwner(0) { }
MTPchannelParticipant(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : mtpDataOwner(0), _type(0) {
read(from, end, cons); read(from, end, cons);
} }
MTPDchannelParticipant &_channelParticipant() { MTPDchannelParticipant &_channelParticipant() {
if (!data) throw mtpErrorUninitialized(); if (!data) throw mtpErrorUninitialized();
if (_type != mtpc_channelParticipant) throw mtpErrorWrongTypeId(_type, mtpc_channelParticipant);
split(); split();
return *(MTPDchannelParticipant*)data; return *(MTPDchannelParticipant*)data;
} }
const MTPDchannelParticipant &c_channelParticipant() const { const MTPDchannelParticipant &c_channelParticipant() const {
if (!data) throw mtpErrorUninitialized(); if (!data) throw mtpErrorUninitialized();
if (_type != mtpc_channelParticipant) throw mtpErrorWrongTypeId(_type, mtpc_channelParticipant);
return *(const MTPDchannelParticipant*)data; return *(const MTPDchannelParticipant*)data;
} }
MTPDchannelParticipantModerator &_channelParticipantModerator() {
if (!data) throw mtpErrorUninitialized();
if (_type != mtpc_channelParticipantModerator) throw mtpErrorWrongTypeId(_type, mtpc_channelParticipantModerator);
split();
return *(MTPDchannelParticipantModerator*)data;
}
const MTPDchannelParticipantModerator &c_channelParticipantModerator() const {
if (!data) throw mtpErrorUninitialized();
if (_type != mtpc_channelParticipantModerator) throw mtpErrorWrongTypeId(_type, mtpc_channelParticipantModerator);
return *(const MTPDchannelParticipantModerator*)data;
}
MTPDchannelParticipantPublisher &_channelParticipantPublisher() {
if (!data) throw mtpErrorUninitialized();
if (_type != mtpc_channelParticipantPublisher) throw mtpErrorWrongTypeId(_type, mtpc_channelParticipantPublisher);
split();
return *(MTPDchannelParticipantPublisher*)data;
}
const MTPDchannelParticipantPublisher &c_channelParticipantPublisher() const {
if (!data) throw mtpErrorUninitialized();
if (_type != mtpc_channelParticipantPublisher) throw mtpErrorWrongTypeId(_type, mtpc_channelParticipantPublisher);
return *(const MTPDchannelParticipantPublisher*)data;
}
MTPDchannelParticipantCreator &_channelParticipantCreator() {
if (!data) throw mtpErrorUninitialized();
if (_type != mtpc_channelParticipantCreator) throw mtpErrorWrongTypeId(_type, mtpc_channelParticipantCreator);
split();
return *(MTPDchannelParticipantCreator*)data;
}
const MTPDchannelParticipantCreator &c_channelParticipantCreator() const {
if (!data) throw mtpErrorUninitialized();
if (_type != mtpc_channelParticipantCreator) throw mtpErrorWrongTypeId(_type, mtpc_channelParticipantCreator);
return *(const MTPDchannelParticipantCreator*)data;
}
uint32 innerLength() const; uint32 innerLength() const;
mtpTypeId type() const; mtpTypeId type() const;
void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_channelParticipant); void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons);
void write(mtpBuffer &to) const; void write(mtpBuffer &to) const;
typedef void ResponseType; typedef void ResponseType;
private: private:
explicit MTPchannelParticipant(mtpTypeId type);
explicit MTPchannelParticipant(MTPDchannelParticipant *_data); explicit MTPchannelParticipant(MTPDchannelParticipant *_data);
explicit MTPchannelParticipant(MTPDchannelParticipantModerator *_data);
explicit MTPchannelParticipant(MTPDchannelParticipantPublisher *_data);
explicit MTPchannelParticipant(MTPDchannelParticipantCreator *_data);
friend MTPchannelParticipant MTP_channelParticipant(MTPint _user_id, MTPint _inviter_id, MTPint _date); friend MTPchannelParticipant MTP_channelParticipant(MTPint _user_id, MTPint _inviter_id, MTPint _date);
friend MTPchannelParticipant MTP_channelParticipantModerator(MTPint _user_id, MTPint _inviter_id, MTPint _date);
friend MTPchannelParticipant MTP_channelParticipantPublisher(MTPint _user_id, MTPint _inviter_id, MTPint _date);
friend MTPchannelParticipant MTP_channelParticipantCreator(MTPint _user_id);
mtpTypeId _type;
}; };
typedef MTPBoxed<MTPchannelParticipant> MTPChannelParticipant; typedef MTPBoxed<MTPchannelParticipant> MTPChannelParticipant;
class MTPchannelParticipantsFilter {
public:
MTPchannelParticipantsFilter() : _type(0) {
}
MTPchannelParticipantsFilter(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : _type(0) {
read(from, end, cons);
}
uint32 innerLength() const;
mtpTypeId type() const;
void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons);
void write(mtpBuffer &to) const;
typedef void ResponseType;
private:
explicit MTPchannelParticipantsFilter(mtpTypeId type);
friend MTPchannelParticipantsFilter MTP_channelParticipantsRecent();
friend MTPchannelParticipantsFilter MTP_channelParticipantsAdmins();
mtpTypeId _type;
};
typedef MTPBoxed<MTPchannelParticipantsFilter> MTPChannelParticipantsFilter;
class MTPchannelParticipantRole {
public:
MTPchannelParticipantRole() : _type(0) {
}
MTPchannelParticipantRole(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : _type(0) {
read(from, end, cons);
}
uint32 innerLength() const;
mtpTypeId type() const;
void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons);
void write(mtpBuffer &to) const;
typedef void ResponseType;
private:
explicit MTPchannelParticipantRole(mtpTypeId type);
friend MTPchannelParticipantRole MTP_channelRoleEmpty();
friend MTPchannelParticipantRole MTP_channelRoleModerator();
friend MTPchannelParticipantRole MTP_channelRolePublisher();
mtpTypeId _type;
};
typedef MTPBoxed<MTPchannelParticipantRole> MTPChannelParticipantRole;
class MTPmessages_channelParticipants : private mtpDataOwner { class MTPmessages_channelParticipants : private mtpDataOwner {
public: public:
MTPmessages_channelParticipants(); MTPmessages_channelParticipants();
@ -9705,6 +9839,16 @@ public:
MTPstring vtitle; MTPstring vtitle;
}; };
class MTPDmessageActionChannelToggleComments : public mtpDataImpl<MTPDmessageActionChannelToggleComments> {
public:
MTPDmessageActionChannelToggleComments() {
}
MTPDmessageActionChannelToggleComments(MTPBool _enabled) : venabled(_enabled) {
}
MTPBool venabled;
};
class MTPDdialog : public mtpDataImpl<MTPDdialog> { class MTPDdialog : public mtpDataImpl<MTPDdialog> {
public: public:
MTPDdialog() { MTPDdialog() {
@ -12065,6 +12209,40 @@ public:
MTPint vdate; MTPint vdate;
}; };
class MTPDchannelParticipantModerator : public mtpDataImpl<MTPDchannelParticipantModerator> {
public:
MTPDchannelParticipantModerator() {
}
MTPDchannelParticipantModerator(MTPint _user_id, MTPint _inviter_id, MTPint _date) : vuser_id(_user_id), vinviter_id(_inviter_id), vdate(_date) {
}
MTPint vuser_id;
MTPint vinviter_id;
MTPint vdate;
};
class MTPDchannelParticipantPublisher : public mtpDataImpl<MTPDchannelParticipantPublisher> {
public:
MTPDchannelParticipantPublisher() {
}
MTPDchannelParticipantPublisher(MTPint _user_id, MTPint _inviter_id, MTPint _date) : vuser_id(_user_id), vinviter_id(_inviter_id), vdate(_date) {
}
MTPint vuser_id;
MTPint vinviter_id;
MTPint vdate;
};
class MTPDchannelParticipantCreator : public mtpDataImpl<MTPDchannelParticipantCreator> {
public:
MTPDchannelParticipantCreator() {
}
MTPDchannelParticipantCreator(MTPint _user_id) : vuser_id(_user_id) {
}
MTPint vuser_id;
};
class MTPDmessages_channelParticipants : public mtpDataImpl<MTPDmessages_channelParticipants> { class MTPDmessages_channelParticipants : public mtpDataImpl<MTPDmessages_channelParticipants> {
public: public:
MTPDmessages_channelParticipants() { MTPDmessages_channelParticipants() {
@ -16889,6 +17067,48 @@ public:
} }
}; };
class MTPmessages_toggleChannelComments { // RPC method 'messages.toggleChannelComments'
public:
MTPInputChat vchat_id;
MTPBool venabled;
MTPmessages_toggleChannelComments() {
}
MTPmessages_toggleChannelComments(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_toggleChannelComments) {
read(from, end, cons);
}
MTPmessages_toggleChannelComments(const MTPInputChat &_chat_id, MTPBool _enabled) : vchat_id(_chat_id), venabled(_enabled) {
}
uint32 innerLength() const {
return vchat_id.innerLength() + venabled.innerLength();
}
mtpTypeId type() const {
return mtpc_messages_toggleChannelComments;
}
void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_toggleChannelComments) {
vchat_id.read(from, end);
venabled.read(from, end);
}
void write(mtpBuffer &to) const {
vchat_id.write(to);
venabled.write(to);
}
typedef MTPUpdates ResponseType;
};
class MTPmessages_ToggleChannelComments : public MTPBoxed<MTPmessages_toggleChannelComments> {
public:
MTPmessages_ToggleChannelComments() {
}
MTPmessages_ToggleChannelComments(const MTPmessages_toggleChannelComments &v) : MTPBoxed<MTPmessages_toggleChannelComments>(v) {
}
MTPmessages_ToggleChannelComments(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed<MTPmessages_toggleChannelComments>(from, end, cons) {
}
MTPmessages_ToggleChannelComments(const MTPInputChat &_chat_id, MTPBool _enabled) : MTPBoxed<MTPmessages_toggleChannelComments>(MTPmessages_toggleChannelComments(_chat_id, _enabled)) {
}
};
class MTPmessages_deleteChannelMessages { // RPC method 'messages.deleteChannelMessages' class MTPmessages_deleteChannelMessages { // RPC method 'messages.deleteChannelMessages'
public: public:
MTPInputPeer vpeer; MTPInputPeer vpeer;
@ -17102,6 +17322,7 @@ public:
class MTPmessages_getChannelParticipants { // RPC method 'messages.getChannelParticipants' class MTPmessages_getChannelParticipants { // RPC method 'messages.getChannelParticipants'
public: public:
MTPInputChat vchat_id; MTPInputChat vchat_id;
MTPChannelParticipantsFilter vfilter;
MTPint voffset; MTPint voffset;
MTPint vlimit; MTPint vlimit;
@ -17110,22 +17331,24 @@ public:
MTPmessages_getChannelParticipants(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_getChannelParticipants) { MTPmessages_getChannelParticipants(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_getChannelParticipants) {
read(from, end, cons); read(from, end, cons);
} }
MTPmessages_getChannelParticipants(const MTPInputChat &_chat_id, MTPint _offset, MTPint _limit) : vchat_id(_chat_id), voffset(_offset), vlimit(_limit) { MTPmessages_getChannelParticipants(const MTPInputChat &_chat_id, const MTPChannelParticipantsFilter &_filter, MTPint _offset, MTPint _limit) : vchat_id(_chat_id), vfilter(_filter), voffset(_offset), vlimit(_limit) {
} }
uint32 innerLength() const { uint32 innerLength() const {
return vchat_id.innerLength() + voffset.innerLength() + vlimit.innerLength(); return vchat_id.innerLength() + vfilter.innerLength() + voffset.innerLength() + vlimit.innerLength();
} }
mtpTypeId type() const { mtpTypeId type() const {
return mtpc_messages_getChannelParticipants; return mtpc_messages_getChannelParticipants;
} }
void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_getChannelParticipants) { void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_getChannelParticipants) {
vchat_id.read(from, end); vchat_id.read(from, end);
vfilter.read(from, end);
voffset.read(from, end); voffset.read(from, end);
vlimit.read(from, end); vlimit.read(from, end);
} }
void write(mtpBuffer &to) const { void write(mtpBuffer &to) const {
vchat_id.write(to); vchat_id.write(to);
vfilter.write(to);
voffset.write(to); voffset.write(to);
vlimit.write(to); vlimit.write(to);
} }
@ -17140,7 +17363,52 @@ public:
} }
MTPmessages_GetChannelParticipants(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed<MTPmessages_getChannelParticipants>(from, end, cons) { MTPmessages_GetChannelParticipants(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed<MTPmessages_getChannelParticipants>(from, end, cons) {
} }
MTPmessages_GetChannelParticipants(const MTPInputChat &_chat_id, MTPint _offset, MTPint _limit) : MTPBoxed<MTPmessages_getChannelParticipants>(MTPmessages_getChannelParticipants(_chat_id, _offset, _limit)) { MTPmessages_GetChannelParticipants(const MTPInputChat &_chat_id, const MTPChannelParticipantsFilter &_filter, MTPint _offset, MTPint _limit) : MTPBoxed<MTPmessages_getChannelParticipants>(MTPmessages_getChannelParticipants(_chat_id, _filter, _offset, _limit)) {
}
};
class MTPmessages_editChatAdmin { // RPC method 'messages.editChatAdmin'
public:
MTPInputChat vchat_id;
MTPInputUser vuser_id;
MTPChannelParticipantRole vrole;
MTPmessages_editChatAdmin() {
}
MTPmessages_editChatAdmin(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_editChatAdmin) {
read(from, end, cons);
}
MTPmessages_editChatAdmin(const MTPInputChat &_chat_id, const MTPInputUser &_user_id, const MTPChannelParticipantRole &_role) : vchat_id(_chat_id), vuser_id(_user_id), vrole(_role) {
}
uint32 innerLength() const {
return vchat_id.innerLength() + vuser_id.innerLength() + vrole.innerLength();
}
mtpTypeId type() const {
return mtpc_messages_editChatAdmin;
}
void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_editChatAdmin) {
vchat_id.read(from, end);
vuser_id.read(from, end);
vrole.read(from, end);
}
void write(mtpBuffer &to) const {
vchat_id.write(to);
vuser_id.write(to);
vrole.write(to);
}
typedef MTPBool ResponseType;
};
class MTPmessages_EditChatAdmin : public MTPBoxed<MTPmessages_editChatAdmin> {
public:
MTPmessages_EditChatAdmin() {
}
MTPmessages_EditChatAdmin(const MTPmessages_editChatAdmin &v) : MTPBoxed<MTPmessages_editChatAdmin>(v) {
}
MTPmessages_EditChatAdmin(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed<MTPmessages_editChatAdmin>(from, end, cons) {
}
MTPmessages_EditChatAdmin(const MTPInputChat &_chat_id, const MTPInputUser &_user_id, const MTPChannelParticipantRole &_role) : MTPBoxed<MTPmessages_editChatAdmin>(MTPmessages_editChatAdmin(_chat_id, _user_id, _role)) {
} }
}; };
@ -21118,6 +21386,10 @@ inline uint32 MTPmessageAction::innerLength() const {
const MTPDmessageActionChannelCreate &v(c_messageActionChannelCreate()); const MTPDmessageActionChannelCreate &v(c_messageActionChannelCreate());
return v.vtitle.innerLength(); return v.vtitle.innerLength();
} }
case mtpc_messageActionChannelToggleComments: {
const MTPDmessageActionChannelToggleComments &v(c_messageActionChannelToggleComments());
return v.venabled.innerLength();
}
} }
return 0; return 0;
} }
@ -21166,6 +21438,11 @@ inline void MTPmessageAction::read(const mtpPrime *&from, const mtpPrime *end, m
MTPDmessageActionChannelCreate &v(_messageActionChannelCreate()); MTPDmessageActionChannelCreate &v(_messageActionChannelCreate());
v.vtitle.read(from, end); v.vtitle.read(from, end);
} break; } break;
case mtpc_messageActionChannelToggleComments: _type = cons; {
if (!data) setData(new MTPDmessageActionChannelToggleComments());
MTPDmessageActionChannelToggleComments &v(_messageActionChannelToggleComments());
v.venabled.read(from, end);
} break;
default: throw mtpErrorUnexpected(cons, "MTPmessageAction"); default: throw mtpErrorUnexpected(cons, "MTPmessageAction");
} }
} }
@ -21200,6 +21477,10 @@ inline void MTPmessageAction::write(mtpBuffer &to) const {
const MTPDmessageActionChannelCreate &v(c_messageActionChannelCreate()); const MTPDmessageActionChannelCreate &v(c_messageActionChannelCreate());
v.vtitle.write(to); v.vtitle.write(to);
} break; } break;
case mtpc_messageActionChannelToggleComments: {
const MTPDmessageActionChannelToggleComments &v(c_messageActionChannelToggleComments());
v.venabled.write(to);
} break;
} }
} }
inline MTPmessageAction::MTPmessageAction(mtpTypeId type) : mtpDataOwner(0), _type(type) { inline MTPmessageAction::MTPmessageAction(mtpTypeId type) : mtpDataOwner(0), _type(type) {
@ -21213,6 +21494,7 @@ inline MTPmessageAction::MTPmessageAction(mtpTypeId type) : mtpDataOwner(0), _ty
case mtpc_messageActionChatDeleteUser: setData(new MTPDmessageActionChatDeleteUser()); break; case mtpc_messageActionChatDeleteUser: setData(new MTPDmessageActionChatDeleteUser()); break;
case mtpc_messageActionChatJoinedByLink: setData(new MTPDmessageActionChatJoinedByLink()); break; case mtpc_messageActionChatJoinedByLink: setData(new MTPDmessageActionChatJoinedByLink()); break;
case mtpc_messageActionChannelCreate: setData(new MTPDmessageActionChannelCreate()); break; case mtpc_messageActionChannelCreate: setData(new MTPDmessageActionChannelCreate()); break;
case mtpc_messageActionChannelToggleComments: setData(new MTPDmessageActionChannelToggleComments()); break;
default: throw mtpErrorBadTypeId(type, "MTPmessageAction"); default: throw mtpErrorBadTypeId(type, "MTPmessageAction");
} }
} }
@ -21230,6 +21512,8 @@ inline MTPmessageAction::MTPmessageAction(MTPDmessageActionChatJoinedByLink *_da
} }
inline MTPmessageAction::MTPmessageAction(MTPDmessageActionChannelCreate *_data) : mtpDataOwner(_data), _type(mtpc_messageActionChannelCreate) { inline MTPmessageAction::MTPmessageAction(MTPDmessageActionChannelCreate *_data) : mtpDataOwner(_data), _type(mtpc_messageActionChannelCreate) {
} }
inline MTPmessageAction::MTPmessageAction(MTPDmessageActionChannelToggleComments *_data) : mtpDataOwner(_data), _type(mtpc_messageActionChannelToggleComments) {
}
inline MTPmessageAction MTP_messageActionEmpty() { inline MTPmessageAction MTP_messageActionEmpty() {
return MTPmessageAction(mtpc_messageActionEmpty); return MTPmessageAction(mtpc_messageActionEmpty);
} }
@ -21257,6 +21541,9 @@ inline MTPmessageAction MTP_messageActionChatJoinedByLink(MTPint _inviter_id) {
inline MTPmessageAction MTP_messageActionChannelCreate(const MTPstring &_title) { inline MTPmessageAction MTP_messageActionChannelCreate(const MTPstring &_title) {
return MTPmessageAction(new MTPDmessageActionChannelCreate(_title)); return MTPmessageAction(new MTPDmessageActionChannelCreate(_title));
} }
inline MTPmessageAction MTP_messageActionChannelToggleComments(MTPBool _enabled) {
return MTPmessageAction(new MTPDmessageActionChannelToggleComments(_enabled));
}
inline uint32 MTPdialog::innerLength() const { inline uint32 MTPdialog::innerLength() const {
switch (_type) { switch (_type) {
@ -27515,36 +27802,187 @@ inline MTPcontacts_resolvedPeer MTP_contacts_resolvedPeer(const MTPPeer &_peer,
return MTPcontacts_resolvedPeer(new MTPDcontacts_resolvedPeer(_peer, _chats, _users)); return MTPcontacts_resolvedPeer(new MTPDcontacts_resolvedPeer(_peer, _chats, _users));
} }
inline MTPchannelParticipant::MTPchannelParticipant() : mtpDataOwner(new MTPDchannelParticipant()) {
}
inline uint32 MTPchannelParticipant::innerLength() const { inline uint32 MTPchannelParticipant::innerLength() const {
switch (_type) {
case mtpc_channelParticipant: {
const MTPDchannelParticipant &v(c_channelParticipant()); const MTPDchannelParticipant &v(c_channelParticipant());
return v.vuser_id.innerLength() + v.vinviter_id.innerLength() + v.vdate.innerLength(); return v.vuser_id.innerLength() + v.vinviter_id.innerLength() + v.vdate.innerLength();
}
case mtpc_channelParticipantModerator: {
const MTPDchannelParticipantModerator &v(c_channelParticipantModerator());
return v.vuser_id.innerLength() + v.vinviter_id.innerLength() + v.vdate.innerLength();
}
case mtpc_channelParticipantPublisher: {
const MTPDchannelParticipantPublisher &v(c_channelParticipantPublisher());
return v.vuser_id.innerLength() + v.vinviter_id.innerLength() + v.vdate.innerLength();
}
case mtpc_channelParticipantCreator: {
const MTPDchannelParticipantCreator &v(c_channelParticipantCreator());
return v.vuser_id.innerLength();
}
}
return 0;
} }
inline mtpTypeId MTPchannelParticipant::type() const { inline mtpTypeId MTPchannelParticipant::type() const {
return mtpc_channelParticipant; if (!_type) throw mtpErrorUninitialized();
return _type;
} }
inline void MTPchannelParticipant::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { inline void MTPchannelParticipant::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) {
if (cons != mtpc_channelParticipant) throw mtpErrorUnexpected(cons, "MTPchannelParticipant"); if (cons != _type) setData(0);
switch (cons) {
case mtpc_channelParticipant: _type = cons; {
if (!data) setData(new MTPDchannelParticipant()); if (!data) setData(new MTPDchannelParticipant());
MTPDchannelParticipant &v(_channelParticipant()); MTPDchannelParticipant &v(_channelParticipant());
v.vuser_id.read(from, end); v.vuser_id.read(from, end);
v.vinviter_id.read(from, end); v.vinviter_id.read(from, end);
v.vdate.read(from, end); v.vdate.read(from, end);
} break;
case mtpc_channelParticipantModerator: _type = cons; {
if (!data) setData(new MTPDchannelParticipantModerator());
MTPDchannelParticipantModerator &v(_channelParticipantModerator());
v.vuser_id.read(from, end);
v.vinviter_id.read(from, end);
v.vdate.read(from, end);
} break;
case mtpc_channelParticipantPublisher: _type = cons; {
if (!data) setData(new MTPDchannelParticipantPublisher());
MTPDchannelParticipantPublisher &v(_channelParticipantPublisher());
v.vuser_id.read(from, end);
v.vinviter_id.read(from, end);
v.vdate.read(from, end);
} break;
case mtpc_channelParticipantCreator: _type = cons; {
if (!data) setData(new MTPDchannelParticipantCreator());
MTPDchannelParticipantCreator &v(_channelParticipantCreator());
v.vuser_id.read(from, end);
} break;
default: throw mtpErrorUnexpected(cons, "MTPchannelParticipant");
}
} }
inline void MTPchannelParticipant::write(mtpBuffer &to) const { inline void MTPchannelParticipant::write(mtpBuffer &to) const {
switch (_type) {
case mtpc_channelParticipant: {
const MTPDchannelParticipant &v(c_channelParticipant()); const MTPDchannelParticipant &v(c_channelParticipant());
v.vuser_id.write(to); v.vuser_id.write(to);
v.vinviter_id.write(to); v.vinviter_id.write(to);
v.vdate.write(to); v.vdate.write(to);
} break;
case mtpc_channelParticipantModerator: {
const MTPDchannelParticipantModerator &v(c_channelParticipantModerator());
v.vuser_id.write(to);
v.vinviter_id.write(to);
v.vdate.write(to);
} break;
case mtpc_channelParticipantPublisher: {
const MTPDchannelParticipantPublisher &v(c_channelParticipantPublisher());
v.vuser_id.write(to);
v.vinviter_id.write(to);
v.vdate.write(to);
} break;
case mtpc_channelParticipantCreator: {
const MTPDchannelParticipantCreator &v(c_channelParticipantCreator());
v.vuser_id.write(to);
} break;
}
} }
inline MTPchannelParticipant::MTPchannelParticipant(MTPDchannelParticipant *_data) : mtpDataOwner(_data) { inline MTPchannelParticipant::MTPchannelParticipant(mtpTypeId type) : mtpDataOwner(0), _type(type) {
switch (type) {
case mtpc_channelParticipant: setData(new MTPDchannelParticipant()); break;
case mtpc_channelParticipantModerator: setData(new MTPDchannelParticipantModerator()); break;
case mtpc_channelParticipantPublisher: setData(new MTPDchannelParticipantPublisher()); break;
case mtpc_channelParticipantCreator: setData(new MTPDchannelParticipantCreator()); break;
default: throw mtpErrorBadTypeId(type, "MTPchannelParticipant");
}
}
inline MTPchannelParticipant::MTPchannelParticipant(MTPDchannelParticipant *_data) : mtpDataOwner(_data), _type(mtpc_channelParticipant) {
}
inline MTPchannelParticipant::MTPchannelParticipant(MTPDchannelParticipantModerator *_data) : mtpDataOwner(_data), _type(mtpc_channelParticipantModerator) {
}
inline MTPchannelParticipant::MTPchannelParticipant(MTPDchannelParticipantPublisher *_data) : mtpDataOwner(_data), _type(mtpc_channelParticipantPublisher) {
}
inline MTPchannelParticipant::MTPchannelParticipant(MTPDchannelParticipantCreator *_data) : mtpDataOwner(_data), _type(mtpc_channelParticipantCreator) {
} }
inline MTPchannelParticipant MTP_channelParticipant(MTPint _user_id, MTPint _inviter_id, MTPint _date) { inline MTPchannelParticipant MTP_channelParticipant(MTPint _user_id, MTPint _inviter_id, MTPint _date) {
return MTPchannelParticipant(new MTPDchannelParticipant(_user_id, _inviter_id, _date)); return MTPchannelParticipant(new MTPDchannelParticipant(_user_id, _inviter_id, _date));
} }
inline MTPchannelParticipant MTP_channelParticipantModerator(MTPint _user_id, MTPint _inviter_id, MTPint _date) {
return MTPchannelParticipant(new MTPDchannelParticipantModerator(_user_id, _inviter_id, _date));
}
inline MTPchannelParticipant MTP_channelParticipantPublisher(MTPint _user_id, MTPint _inviter_id, MTPint _date) {
return MTPchannelParticipant(new MTPDchannelParticipantPublisher(_user_id, _inviter_id, _date));
}
inline MTPchannelParticipant MTP_channelParticipantCreator(MTPint _user_id) {
return MTPchannelParticipant(new MTPDchannelParticipantCreator(_user_id));
}
inline uint32 MTPchannelParticipantsFilter::innerLength() const {
return 0;
}
inline mtpTypeId MTPchannelParticipantsFilter::type() const {
if (!_type) throw mtpErrorUninitialized();
return _type;
}
inline void MTPchannelParticipantsFilter::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) {
switch (cons) {
case mtpc_channelParticipantsRecent: _type = cons; break;
case mtpc_channelParticipantsAdmins: _type = cons; break;
default: throw mtpErrorUnexpected(cons, "MTPchannelParticipantsFilter");
}
}
inline void MTPchannelParticipantsFilter::write(mtpBuffer &to) const {
switch (_type) {
}
}
inline MTPchannelParticipantsFilter::MTPchannelParticipantsFilter(mtpTypeId type) : _type(type) {
switch (type) {
case mtpc_channelParticipantsRecent: break;
case mtpc_channelParticipantsAdmins: break;
default: throw mtpErrorBadTypeId(type, "MTPchannelParticipantsFilter");
}
}
inline MTPchannelParticipantsFilter MTP_channelParticipantsRecent() {
return MTPchannelParticipantsFilter(mtpc_channelParticipantsRecent);
}
inline MTPchannelParticipantsFilter MTP_channelParticipantsAdmins() {
return MTPchannelParticipantsFilter(mtpc_channelParticipantsAdmins);
}
inline uint32 MTPchannelParticipantRole::innerLength() const {
return 0;
}
inline mtpTypeId MTPchannelParticipantRole::type() const {
if (!_type) throw mtpErrorUninitialized();
return _type;
}
inline void MTPchannelParticipantRole::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) {
switch (cons) {
case mtpc_channelRoleEmpty: _type = cons; break;
case mtpc_channelRoleModerator: _type = cons; break;
case mtpc_channelRolePublisher: _type = cons; break;
default: throw mtpErrorUnexpected(cons, "MTPchannelParticipantRole");
}
}
inline void MTPchannelParticipantRole::write(mtpBuffer &to) const {
switch (_type) {
}
}
inline MTPchannelParticipantRole::MTPchannelParticipantRole(mtpTypeId type) : _type(type) {
switch (type) {
case mtpc_channelRoleEmpty: break;
case mtpc_channelRoleModerator: break;
case mtpc_channelRolePublisher: break;
default: throw mtpErrorBadTypeId(type, "MTPchannelParticipantRole");
}
}
inline MTPchannelParticipantRole MTP_channelRoleEmpty() {
return MTPchannelParticipantRole(mtpc_channelRoleEmpty);
}
inline MTPchannelParticipantRole MTP_channelRoleModerator() {
return MTPchannelParticipantRole(mtpc_channelRoleModerator);
}
inline MTPchannelParticipantRole MTP_channelRolePublisher() {
return MTPchannelParticipantRole(mtpc_channelRolePublisher);
}
inline MTPmessages_channelParticipants::MTPmessages_channelParticipants() : mtpDataOwner(new MTPDmessages_channelParticipants()) { inline MTPmessages_channelParticipants::MTPmessages_channelParticipants() : mtpDataOwner(new MTPDmessages_channelParticipants()) {
} }

15
Telegram/SourceFiles/mtproto/scheme.tl
View File

@ -257,6 +257,7 @@ messageActionChatAddUser#5e3cfc4b user_id:int = MessageAction;
messageActionChatDeleteUser#b2ae9b0c user_id:int = MessageAction; messageActionChatDeleteUser#b2ae9b0c user_id:int = MessageAction;
messageActionChatJoinedByLink#f89cf5e8 inviter_id:int = MessageAction; messageActionChatJoinedByLink#f89cf5e8 inviter_id:int = MessageAction;
messageActionChannelCreate#95d2ac92 title:string = MessageAction; messageActionChannelCreate#95d2ac92 title:string = MessageAction;
messageActionChannelToggleComments#f2863903 enabled:Bool = MessageAction;
dialog#c1dd804a peer:Peer top_message:int read_inbox_max_id:int unread_count:int notify_settings:PeerNotifySettings = Dialog; dialog#c1dd804a peer:Peer top_message:int read_inbox_max_id:int unread_count:int notify_settings:PeerNotifySettings = Dialog;
dialogChannel#5b8496b2 peer:Peer top_message:int top_important_message:int read_inbox_max_id:int unread_count:int unread_important_count:int notify_settings:PeerNotifySettings pts:int = Dialog; dialogChannel#5b8496b2 peer:Peer top_message:int top_important_message:int read_inbox_max_id:int unread_count:int unread_important_count:int notify_settings:PeerNotifySettings pts:int = Dialog;
@ -602,6 +603,16 @@ channelMessagesFilterCollapsed#fa01232e = ChannelMessagesFilter;
contacts.resolvedPeer#7f077ad9 peer:Peer chats:Vector<Chat> users:Vector<User> = contacts.ResolvedPeer; contacts.resolvedPeer#7f077ad9 peer:Peer chats:Vector<Chat> users:Vector<User> = contacts.ResolvedPeer;
channelParticipant#506116ea user_id:int inviter_id:int date:int = ChannelParticipant; channelParticipant#506116ea user_id:int inviter_id:int date:int = ChannelParticipant;
channelParticipantModerator#91057fef user_id:int inviter_id:int date:int = ChannelParticipant;
channelParticipantPublisher#375d616 user_id:int inviter_id:int date:int = ChannelParticipant;
channelParticipantCreator#e3e2e1f9 user_id:int = ChannelParticipant;
channelParticipantsRecent#de3f3c79 = ChannelParticipantsFilter;
channelParticipantsAdmins#b4608969 = ChannelParticipantsFilter;
channelRoleEmpty#b285a0c6 = ChannelParticipantRole;
channelRoleModerator#9618d975 = ChannelParticipantRole;
channelRolePublisher#515b5530 = ChannelParticipantRole;
messages.channelParticipants#d6891de1 count:int participants:Vector<ChannelParticipant> users:Vector<User> = messages.ChannelParticipants; messages.channelParticipants#d6891de1 count:int participants:Vector<ChannelParticipant> users:Vector<User> = messages.ChannelParticipants;
@ -718,12 +729,14 @@ messages.getChannelDialogs#92689583 offset:int limit:int = messages.Dialogs;
messages.getImportantHistory#24af43a5 peer:InputPeer offset_id:int add_offset:int limit:int max_id:int min_id:int = messages.Messages; messages.getImportantHistory#24af43a5 peer:InputPeer offset_id:int add_offset:int limit:int max_id:int min_id:int = messages.Messages;
messages.readChannelHistory#36a1210e peer:InputPeer max_id:int = Bool; messages.readChannelHistory#36a1210e peer:InputPeer max_id:int = Bool;
messages.createChannel#7f44d2c3 flags:# title:string about:string users:Vector<InputUser> = Updates; messages.createChannel#7f44d2c3 flags:# title:string about:string users:Vector<InputUser> = Updates;
messages.toggleChannelComments#b405b8af chat_id:InputChat enabled:Bool = Updates;
messages.deleteChannelMessages#9995a84f peer:InputPeer id:Vector<int> = messages.AffectedMessages; messages.deleteChannelMessages#9995a84f peer:InputPeer id:Vector<int> = messages.AffectedMessages;
messages.getChannelMessages#5f46b265 peer:InputPeer id:Vector<int> = messages.Messages; messages.getChannelMessages#5f46b265 peer:InputPeer id:Vector<int> = messages.Messages;
messages.incrementMessagesViews#91ffd479 peer:InputPeer id:Vector<int> = Bool; messages.incrementMessagesViews#91ffd479 peer:InputPeer id:Vector<int> = Bool;
messages.getMessagesViews#9abfbbe1 peer:InputPeer id:Vector<int> = Vector<int>; messages.getMessagesViews#9abfbbe1 peer:InputPeer id:Vector<int> = Vector<int>;
messages.editChatAbout#8a969b93 chat_id:InputChat about:string = Bool; messages.editChatAbout#8a969b93 chat_id:InputChat about:string = Bool;
messages.getChannelParticipants#4a771976 chat_id:InputChat offset:int limit:int = messages.ChannelParticipants; messages.getChannelParticipants#38a1db31 chat_id:InputChat filter:ChannelParticipantsFilter offset:int limit:int = messages.ChannelParticipants;
messages.editChatAdmin#62394070 chat_id:InputChat user_id:InputUser role:ChannelParticipantRole = Bool;
messages.checkChannelUsername#e6d2d8f4 chat_id:InputChat username:string = Bool; messages.checkChannelUsername#e6d2d8f4 chat_id:InputChat username:string = Bool;
messages.updateChannelUsername#ce2e9587 chat_id:InputChat username:string = Bool; messages.updateChannelUsername#ce2e9587 chat_id:InputChat username:string = Bool;

2
Telegram/SourceFiles/passcodewidget.cpp
View File

@ -139,7 +139,7 @@ bool PasscodeWidget::animStep(float64 ms) {
_animCache = _bgAnimCache = QPixmap(); _animCache = _bgAnimCache = QPixmap();
showAll(); showAll();
setInnerFocus(); if (App::wnd()) App::wnd()->setInnerFocus();
} else { } else {
a_bgCoord.update(dt1, st::introHideFunc); a_bgCoord.update(dt1, st::introHideFunc);
a_bgAlpha.update(dt1, st::introAlphaHideFunc); a_bgAlpha.update(dt1, st::introAlphaHideFunc);

2
Telegram/SourceFiles/pspecific_linux.cpp
View File

@ -1142,7 +1142,7 @@ void psOpenFile(const QString &name, bool openWith) {
} }
void psShowInFolder(const QString &name) { void psShowInFolder(const QString &name) {
App::wnd()->layerHidden(); App::wnd()->hideLayer(true);
system((qsl("xdg-open ") + escapeShell(QFileInfo(name).absoluteDir().absolutePath())).toUtf8().constData()); system((qsl("xdg-open ") + escapeShell(QFileInfo(name).absoluteDir().absolutePath())).toUtf8().constData());
} }

2
Telegram/SourceFiles/pspecific_mac.cpp
View File

@ -65,7 +65,7 @@ void MacPrivate::notifyClicked(unsigned long long peer, int msgid) {
App::wnd()->showFromTray(); App::wnd()->showFromTray();
if (App::passcoded()) { if (App::passcoded()) {
App::wnd()->passcodeWidget()->setInnerFocus(); App::wnd()->setInnerFocus();
App::wnd()->notifyClear(); App::wnd()->notifyClear();
} else { } else {
App::wnd()->hideSettings(); App::wnd()->hideSettings();

2
Telegram/SourceFiles/pspecific_wnd.cpp
View File

@ -2592,7 +2592,7 @@ public:
App::wnd()->showFromTray(); App::wnd()->showFromTray();
if (App::passcoded()) { if (App::passcoded()) {
App::wnd()->passcodeWidget()->setInnerFocus(); App::wnd()->setInnerFocus();
App::wnd()->notifyClear(); App::wnd()->notifyClear();
} else { } else {
App::wnd()->hideSettings(); App::wnd()->hideSettings();

2
Telegram/SourceFiles/settingswidget.cpp
View File

@ -1523,6 +1523,7 @@ void SettingsInner::onViewEmojis() {
void SettingsInner::onEnterSend() { void SettingsInner::onEnterSend() {
if (_enterSend.checked()) { if (_enterSend.checked()) {
cSetCtrlEnter(false); cSetCtrlEnter(false);
if (App::main()) App::main()->ctrlEnterSubmitUpdated();
Local::writeUserSettings(); Local::writeUserSettings();
} }
} }
@ -1530,6 +1531,7 @@ void SettingsInner::onEnterSend() {
void SettingsInner::onCtrlEnterSend() { void SettingsInner::onCtrlEnterSend() {
if (_ctrlEnterSend.checked()) { if (_ctrlEnterSend.checked()) {
cSetCtrlEnter(true); cSetCtrlEnter(true);
if (App::main()) App::main()->ctrlEnterSubmitUpdated();
Local::writeUserSettings(); Local::writeUserSettings();
} }
} }

14
Telegram/SourceFiles/structs.cpp
View File

@ -96,7 +96,19 @@ PeerData::PeerData(const PeerId &id) : id(id), lnk(new PeerLink(this))
} }
void PeerData::updateName(const QString &newName, const QString &newNameOrPhone, const QString &newUsername) { void PeerData::updateName(const QString &newName, const QString &newNameOrPhone, const QString &newUsername) {
if (name == newName && (!isUser() || (asUser()->nameOrPhone == newNameOrPhone && asUser()->username == newUsername)) && nameVersion > 0) return; if (name == newName && nameVersion > 0) {
if (isUser()) {
if (asUser()->nameOrPhone == newNameOrPhone && asUser()->username == newUsername) {
return;
}
} else if (isChannel()) {
if (asChannel()->username == newUsername) {
return;
}
} else if (isChat()) {
return;
}
}
++nameVersion; ++nameVersion;
name = newName; name = newName;

35
Telegram/SourceFiles/window.cpp
View File

@ -286,7 +286,7 @@ void NotifyWindow::mousePressEvent(QMouseEvent *e) {
} else if (history) { } else if (history) {
App::wnd()->showFromTray(); App::wnd()->showFromTray();
if (App::passcoded()) { if (App::passcoded()) {
App::wnd()->passcodeWidget()->setInnerFocus(); App::wnd()->setInnerFocus();
App::wnd()->notifyClear(); App::wnd()->notifyClear();
} else { } else {
App::wnd()->hideSettings(); App::wnd()->hideSettings();
@ -461,7 +461,7 @@ QWidget *Window::filedialogParent() {
} }
void Window::clearWidgets() { void Window::clearWidgets() {
layerHidden(); hideLayer(true);
if (_passcode) { if (_passcode) {
_passcode->hide(); _passcode->hide();
_passcode->deleteLater(); _passcode->deleteLater();
@ -528,7 +528,7 @@ void Window::setupPasscode(bool anim) {
if (anim) { if (anim) {
_passcode->animShow(bg); _passcode->animShow(bg);
} else { } else {
_passcode->setInnerFocus(); setInnerFocus();
} }
_shouldLockAt = 0; _shouldLockAt = 0;
notifyUpdateAll(); notifyUpdateAll();
@ -746,34 +746,42 @@ void Window::showPhoto(const PhotoLink *lnk, HistoryItem *item) {
} }
void Window::showPhoto(PhotoData *photo, HistoryItem *item) { void Window::showPhoto(PhotoData *photo, HistoryItem *item) {
layerHidden(); hideLayer(true);
_mediaView->showPhoto(photo, item); _mediaView->showPhoto(photo, item);
_mediaView->activateWindow(); _mediaView->activateWindow();
_mediaView->setFocus(); _mediaView->setFocus();
} }
void Window::showPhoto(PhotoData *photo, PeerData *peer) { void Window::showPhoto(PhotoData *photo, PeerData *peer) {
layerHidden(); hideLayer(true);
_mediaView->showPhoto(photo, peer); _mediaView->showPhoto(photo, peer);
_mediaView->activateWindow(); _mediaView->activateWindow();
_mediaView->setFocus(); _mediaView->setFocus();
} }
void Window::showDocument(DocumentData *doc, HistoryItem *item) { void Window::showDocument(DocumentData *doc, HistoryItem *item) {
layerHidden(); hideLayer(true);
_mediaView->showDocument(doc, item); _mediaView->showDocument(doc, item);
_mediaView->activateWindow(); _mediaView->activateWindow();
_mediaView->setFocus(); _mediaView->setFocus();
} }
void Window::showLayer(LayeredWidget *w, bool fast) { void Window::showLayer(LayeredWidget *w, bool fast) {
layerHidden(); hideLayer(true);
layerBG = new BackgroundWidget(this, w); layerBG = new BackgroundWidget(this, w);
if (fast) { if (fast) {
layerBG->showFast(); layerBG->showFast();
} }
} }
void Window::replaceLayer(LayeredWidget *w) {
if (layerBG) {
layerBG->replaceInner(w);
} else {
layerBG = new BackgroundWidget(this, w);
}
}
void Window::showConnecting(const QString &text, const QString &reconnect) { void Window::showConnecting(const QString &text, const QString &reconnect) {
if (_connecting) { if (_connecting) {
_connecting->set(text, reconnect); _connecting->set(text, reconnect);
@ -798,19 +806,12 @@ void Window::hideConnecting() {
if (settings) settings->update(); if (settings) settings->update();
} }
void Window::replaceLayer(LayeredWidget *w) {
if (layerBG) {
layerBG->replaceInner(w);
} else {
layerBG = new BackgroundWidget(this, w);
}
}
void Window::hideLayer(bool fast) { void Window::hideLayer(bool fast) {
if (layerBG) { if (layerBG) {
layerBG->onClose(); layerBG->onClose();
if (fast) { if (fast) {
layerBG->hide(); layerBG->hide();
layerBG->deleteLater();
layerBG = 0; layerBG = 0;
} }
} }
@ -854,7 +855,9 @@ void Window::hideMediaview() {
} }
void Window::setInnerFocus() { void Window::setInnerFocus() {
if (_passcode) { if (layerBG && layerBG->canSetFocus()) {
layerBG->setInnerFocus();
} else if (_passcode) {
_passcode->setInnerFocus(); _passcode->setInnerFocus();
} else if (settings) { } else if (settings) {
settings->setInnerFocus(); settings->setInnerFocus();