mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
John Preston
2016-04-19 17:02:55 +03:00
parent c138f32b4f 3e3cd5878e
commit 10bd2b680d
127 changed files with 9099 additions and 8395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "aboutbox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
#include "autoupdater.h"
#include "boxes/confirmbox.h"

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

@@ -25,7 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "abstractbox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
void BlueTitleShadow::paintEvent(QPaintEvent *e) {
Painter p(this);

3
Telegram/SourceFiles/boxes/addcontactbox.cpp
View File

@@ -28,7 +28,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "photocropbox.h"
#include "ui/filedialog.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
#include "apiwrap.h"
AddContactBox::AddContactBox(QString fname, QString lname, QString phone) : AbstractBox(st::boxWidth)
, _user(0)

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

@@ -26,7 +26,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "autolockbox.h"
#include "confirmbox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
AutoLockBox::AutoLockBox() :
_close(this, lang(lng_box_ok), st::defaultBoxButton) {

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

@@ -23,7 +23,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "backgroundbox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
#include "settingswidget.h"
BackgroundInner::BackgroundInner() :

9
Telegram/SourceFiles/boxes/confirmbox.cpp
View File

@@ -23,9 +23,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "confirmbox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
#include "apiwrap.h"
#include "application.h"
#include "core/click_handler_types.h"
TextParseOptions _confirmBoxTextOptions = {
TextParseLinks | TextParseMultiline | TextParseRichText, // flags
@@ -118,10 +119,10 @@ void ConfirmBox::updateHover() {
QPoint m(mapFromGlobal(_lastMousePos));
textstyleSet(&st::boxTextStyle);
ClickHandlerPtr handler = _text.linkLeft(m.x() - st::boxPadding.left(), m.y() - st::boxPadding.top(), _textWidth, width(), style::al_left);
auto state = _text.getStateLeft(m.x() - st::boxPadding.left(), m.y() - st::boxPadding.top(), _textWidth, width());
textstyleRestore();
ClickHandler::setActive(handler, this);
ClickHandler::setActive(state.link, this);
}
void ConfirmBox::closePressed() {

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

@@ -25,7 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "connectionbox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
ConnectionBox::ConnectionBox() : AbstractBox(st::boxWidth)
, _hostInput(this, st::connectionHostInputField, lang(lng_connection_host_ph), cConnectionProxy().host)

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

@@ -26,11 +26,12 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "boxes/addcontactbox.h"
#include "boxes/contactsbox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
#include "application.h"
#include "ui/filedialog.h"
#include "boxes/photocropbox.h"
#include "boxes/confirmbox.h"
#include "apiwrap.h"
QString cantInviteError() {
return lng_cant_invite_not_contact(lt_more_info, textcmdLink(qsl("https://telegram.me/spambot"), lang(lng_cant_more_info)));
@@ -956,7 +957,6 @@ void ContactsInner::peopleReceived(const QString &query, const QVector<MTPPeer>
if (p->asUser()->botInfo->cantJoinGroups) continue;
}
if (_channel) {
if (_channel->isMegagroup() && _membersFilter == MembersFilterAdmins) continue;
if (!_channel->isMegagroup() && _membersFilter != MembersFilterAdmins) continue;
}
}

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

@@ -23,7 +23,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "emojibox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
namespace {
// copied from genemoji.cpp

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

@@ -26,7 +26,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "languagebox.h"
#include "confirmbox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
#include "langloaderplain.h"

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

@@ -23,7 +23,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "passcodebox.h"
#include "confirmbox.h"
#include "window.h"
#include "mainwindow.h"
#include "localstorage.h"

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

@@ -25,7 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "sessionsbox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
#include "countries.h"
#include "confirmbox.h"

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

@@ -23,10 +23,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "stickersetbox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
#include "settingswidget.h"
#include "boxes/confirmbox.h"
#include "apiwrap.h"
#include "localstorage.h"
StickerSetInner::StickerSetInner(const MTPInputStickerSet &set) : TWidget()

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

@@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "application.h"
#include "usernamebox.h"
#include "mainwidget.h"
#include "window.h"
#include "mainwindow.h"
UsernameBox::UsernameBox() : AbstractBox(st::boxWidth),
_save(this, lang(lng_settings_save), st::defaultBoxButton),