Channels report box added to new profile implementation.
Removed old profilewidget module files.
This commit is contained in:
John Preston
parent
3915576673
commit
e336030b5e
|
|
@ -424,6 +424,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_profile_delete_channel" = "Delete channel";
|
||||
"lng_profile_leave_group" = "Leave group";
|
||||
"lng_profile_delete_group" = "Delete group";
|
||||
"lng_profile_report" = "Report";
|
||||
"lng_profile_search_messages" = "Search for messages";
|
||||
"lng_profile_block_user" = "Block user";
|
||||
"lng_profile_unblock_user" = "Unblock user";
|
||||
|
|
@ -465,6 +466,15 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
"lng_profile_drop_area_subtitle_channel" = "to set it as a channel photo";
|
||||
"lng_profile_top_bar_share_contact" = "Share";
|
||||
|
||||
"lng_report_title" = "Report channel";
|
||||
"lng_report_reason_spam" = "Spam";
|
||||
"lng_report_reason_violence" = "Violence";
|
||||
"lng_report_reason_pornography" = "Pornography";
|
||||
"lng_report_reason_other" = "Other";
|
||||
"lng_report_reason_description" = "Description";
|
||||
"lng_report_button" = "Report";
|
||||
"lng_report_thanks" = "Thank you! Your report will be reviewed by our team very soon.";
|
||||
|
||||
"lng_channel_add_admins" = "New administrator";
|
||||
"lng_channel_add_members" = "Add members";
|
||||
"lng_channel_members" = "Members";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,147 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include "stdafx.h"
|
||||
#include "report_box.h"
|
||||
|
||||
#include "lang.h"
|
||||
#include "styles/style_profile.h"
|
||||
#include "boxes/confirmbox.h"
|
||||
|
||||
ReportBox::ReportBox(ChannelData *channel) : AbstractBox(st::boxWidth)
|
||||
, _channel(channel)
|
||||
, _reasonSpam(this, qsl("report_reason"), ReasonSpam, lang(lng_report_reason_spam), true)
|
||||
, _reasonViolence(this, qsl("report_reason"), ReasonViolence, lang(lng_report_reason_violence))
|
||||
, _reasonPornography(this, qsl("report_reason"), ReasonPornography, lang(lng_report_reason_pornography))
|
||||
, _reasonOther(this, qsl("report_reason"), ReasonOther, lang(lng_report_reason_other))
|
||||
, _report(this, lang(lng_report_button), st::defaultBoxButton)
|
||||
, _cancel(this, lang(lng_cancel), st::cancelBoxButton) {
|
||||
connect(_report, SIGNAL(clicked()), this, SLOT(onReport()));
|
||||
connect(_cancel, SIGNAL(clicked()), this, SLOT(onClose()));
|
||||
|
||||
connect(_reasonSpam, SIGNAL(changed()), this, SLOT(onChange()));
|
||||
connect(_reasonViolence, SIGNAL(changed()), this, SLOT(onChange()));
|
||||
connect(_reasonPornography, SIGNAL(changed()), this, SLOT(onChange()));
|
||||
connect(_reasonOther, SIGNAL(changed()), this, SLOT(onChange()));
|
||||
|
||||
updateMaxHeight();
|
||||
|
||||
prepare();
|
||||
}
|
||||
|
||||
void ReportBox::paintEvent(QPaintEvent *e) {
|
||||
Painter p(this);
|
||||
if (paint(p)) return;
|
||||
|
||||
paintTitle(p, lang(lng_report_title));
|
||||
}
|
||||
|
||||
void ReportBox::resizeEvent(QResizeEvent *e) {
|
||||
_reasonSpam->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), st::boxTitleHeight + st::boxOptionListPadding.top());
|
||||
_reasonViolence->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonSpam->y() + _reasonSpam->height() + st::boxOptionListPadding.top());
|
||||
_reasonPornography->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonViolence->y() + _reasonViolence->height() + st::boxOptionListPadding.top());
|
||||
_reasonOther->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonPornography->y() + _reasonPornography->height() + st::boxOptionListPadding.top());
|
||||
|
||||
if (_reasonOtherText) {
|
||||
_reasonOtherText->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left() - st::defaultInputField.textMargins.left(), _reasonOther->y() + _reasonOther->height() + st::newGroupDescriptionPadding.top());
|
||||
}
|
||||
|
||||
_report->moveToRight(st::boxButtonPadding.right(), height() - st::boxButtonPadding.bottom() - _report->height());
|
||||
_cancel->moveToRight(st::boxButtonPadding.right() + _report->width() + st::boxButtonPadding.left(), _report->y());
|
||||
}
|
||||
|
||||
void ReportBox::onChange() {
|
||||
if (_reasonOther->checked()) {
|
||||
if (!_reasonOtherText) {
|
||||
_reasonOtherText = new InputArea(this, st::profileReportReasonOther, lang(lng_report_reason_description));
|
||||
_reasonOtherText->show();
|
||||
_reasonOtherText->setCtrlEnterSubmit(CtrlEnterSubmitBoth);
|
||||
_reasonOtherText->setMaxLength(MaxPhotoCaption);
|
||||
_reasonOtherText->resize(width() - (st::boxPadding.left() + st::boxOptionListPadding.left() + st::boxPadding.right()), _reasonOtherText->height());
|
||||
|
||||
updateMaxHeight();
|
||||
connect(_reasonOtherText, SIGNAL(resized()), this, SLOT(onDescriptionResized()));
|
||||
connect(_reasonOtherText, SIGNAL(submitted(bool)), this, SLOT(onReport()));
|
||||
connect(_reasonOtherText, SIGNAL(cancelled()), this, SLOT(onClose()));
|
||||
}
|
||||
} else if (_reasonOtherText) {
|
||||
_reasonOtherText.destroy();
|
||||
updateMaxHeight();
|
||||
}
|
||||
setInnerFocus();
|
||||
}
|
||||
|
||||
void ReportBox::setInnerFocus() {
|
||||
if (_reasonOtherText) {
|
||||
_reasonOtherText->setFocus();
|
||||
} else {
|
||||
setFocus();
|
||||
}
|
||||
}
|
||||
|
||||
void ReportBox::onDescriptionResized() {
|
||||
updateMaxHeight();
|
||||
update();
|
||||
}
|
||||
|
||||
void ReportBox::onReport() {
|
||||
if (_requestId) return;
|
||||
|
||||
if (_reasonOtherText && _reasonOtherText->getLastText().trimmed().isEmpty()) {
|
||||
_reasonOtherText->showError();
|
||||
return;
|
||||
}
|
||||
|
||||
auto getReason = [this]() {
|
||||
if (_reasonViolence->checked()) {
|
||||
return MTP_inputReportReasonViolence();
|
||||
} else if (_reasonPornography->checked()) {
|
||||
return MTP_inputReportReasonPornography();
|
||||
} else if (_reasonOtherText) {
|
||||
return MTP_inputReportReasonOther(MTP_string(_reasonOtherText->getLastText()));
|
||||
} else {
|
||||
return MTP_inputReportReasonSpam();
|
||||
}
|
||||
};
|
||||
_requestId = MTP::send(MTPaccount_ReportPeer(_channel->input, getReason()), rpcDone(&ReportBox::reportDone), rpcFail(&ReportBox::reportFail));
|
||||
}
|
||||
|
||||
void ReportBox::reportDone(const MTPBool &result) {
|
||||
_requestId = 0;
|
||||
Ui::showLayer(new InformBox(lang(lng_report_thanks)));
|
||||
}
|
||||
|
||||
bool ReportBox::reportFail(const RPCError &error) {
|
||||
if (MTP::isDefaultHandledError(error)) return false;
|
||||
|
||||
_requestId = 0;
|
||||
if (_reasonOtherText) {
|
||||
_reasonOtherText->showError();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void ReportBox::updateMaxHeight() {
|
||||
int32 h = st::boxTitleHeight + 4 * (st::boxOptionListPadding.top() + _reasonSpam->height()) + st::boxButtonPadding.top() + _report->height() + st::boxButtonPadding.bottom();
|
||||
if (_reasonOtherText) {
|
||||
h += st::newGroupDescriptionPadding.top() + _reasonOtherText->height() + st::newGroupDescriptionPadding.bottom();
|
||||
}
|
||||
setMaxHeight(h);
|
||||
}
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "abstractbox.h"
|
||||
|
||||
class ReportBox : public AbstractBox, public RPCSender {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
ReportBox(ChannelData *channel);
|
||||
|
||||
private slots:
|
||||
void onReport();
|
||||
void onChange();
|
||||
void onDescriptionResized();
|
||||
|
||||
protected:
|
||||
void paintEvent(QPaintEvent *e) override;
|
||||
void resizeEvent(QResizeEvent *e) override;
|
||||
|
||||
void showAll() override {
|
||||
showChildren();
|
||||
}
|
||||
void hideAll() override {
|
||||
hideChildren();
|
||||
}
|
||||
void setInnerFocus() override;
|
||||
|
||||
private:
|
||||
void updateMaxHeight();
|
||||
|
||||
void reportDone(const MTPBool &result);
|
||||
bool reportFail(const RPCError &error);
|
||||
|
||||
ChannelData *_channel;
|
||||
|
||||
ChildWidget<Radiobutton> _reasonSpam;
|
||||
ChildWidget<Radiobutton> _reasonViolence;
|
||||
ChildWidget<Radiobutton> _reasonPornography;
|
||||
ChildWidget<Radiobutton> _reasonOther;
|
||||
ChildWidget<InputArea> _reasonOtherText = { nullptr };
|
||||
|
||||
ChildWidget<BoxButton> _report, _cancel;
|
||||
|
||||
enum Reason {
|
||||
ReasonSpam,
|
||||
ReasonViolence,
|
||||
ReasonPornography,
|
||||
ReasonOther,
|
||||
};
|
||||
mtpRequestId _requestId = 0;
|
||||
|
||||
};
|
||||
|
|
@ -29,7 +29,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
#include "apiwrap.h"
|
||||
#include "dialogswidget.h"
|
||||
#include "historywidget.h"
|
||||
#include "profilewidget.h"
|
||||
#include "overviewwidget.h"
|
||||
#include "playerwidget.h"
|
||||
#include "lang.h"
|
||||
|
|
|
|||
|
|
@ -162,3 +162,8 @@ profileLimitReachedLabel: flatLabel(labelDefFlat) {
|
|||
profileLimitReachedStyle: textStyle(defaultTextStyle) {
|
||||
lineHeight: 19px;
|
||||
}
|
||||
|
||||
profileReportReasonOther: InputArea(defaultInputArea) {
|
||||
textMargins: margins(1px, 6px, 1px, 4px);
|
||||
heightMax: 115px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
#include "styles/style_profile.h"
|
||||
#include "ui/buttons/left_outline_button.h"
|
||||
#include "boxes/confirmbox.h"
|
||||
#include "boxes/report_box.h"
|
||||
#include "mainwidget.h"
|
||||
#include "observer_peer.h"
|
||||
#include "apiwrap.h"
|
||||
|
|
@ -135,7 +136,9 @@ void ActionsWidget::refreshButtons() {
|
|||
addButton(lang(lng_profile_clear_history), SLOT(onClearHistory()));
|
||||
addButton(lang(lng_profile_clear_and_exit), SLOT(onDeleteConversation()));
|
||||
} else if (auto channel = peer()->asChannel()) {
|
||||
// addButton(lang(lng_profile_report), SLOT(onReport()));
|
||||
if (!channel->amCreator()) {
|
||||
addButton(lang(lng_profile_report), SLOT(onReport()));
|
||||
}
|
||||
refreshDeleteChannel();
|
||||
refreshLeaveChannel();
|
||||
}
|
||||
|
|
@ -351,4 +354,10 @@ void ActionsWidget::onLeaveChannelSure() {
|
|||
App::api()->leaveChannel(peer()->asChannel());
|
||||
}
|
||||
|
||||
void ActionsWidget::onReport() {
|
||||
if (auto channel = peer()->asChannel()) {
|
||||
Ui::showLayer(new ReportBox(channel));
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Profile
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ private slots:
|
|||
void onDeleteChannelSure();
|
||||
void onLeaveChannel();
|
||||
void onLeaveChannelSure();
|
||||
void onReport();
|
||||
|
||||
private:
|
||||
// Observed notifications.
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,298 +0,0 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
class ProfileWidget;
|
||||
class ProfileInner : public TWidget, public RPCSender, public ClickHandlerHost {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
|
||||
ProfileInner(ProfileWidget *profile, PeerData *peer);
|
||||
|
||||
void start();
|
||||
|
||||
void peerUsernameChanged();
|
||||
|
||||
bool event(QEvent *e) override;
|
||||
void paintEvent(QPaintEvent *e) override;
|
||||
void mouseMoveEvent(QMouseEvent *e) override;
|
||||
void mousePressEvent(QMouseEvent *e) override;
|
||||
void mouseReleaseEvent(QMouseEvent *e) override;
|
||||
void keyPressEvent(QKeyEvent *e) override;
|
||||
void enterEvent(QEvent *e) override;
|
||||
void leaveEvent(QEvent *e) override;
|
||||
void leaveToChildEvent(QEvent *e) override;
|
||||
void resizeEvent(QResizeEvent *e) override;
|
||||
void contextMenuEvent(QContextMenuEvent *e) override;
|
||||
|
||||
void step_photo(float64 ms, bool timer);
|
||||
|
||||
PeerData *peer() const;
|
||||
bool allMediaShown() const;
|
||||
|
||||
void updateOnlineDisplay();
|
||||
void updateOnlineDisplayTimer();
|
||||
void reorderParticipants();
|
||||
|
||||
void saveError(const QString &str = QString());
|
||||
|
||||
void loadProfilePhotos(int32 yFrom);
|
||||
|
||||
void updateNotifySettings();
|
||||
int32 mediaOverviewUpdated(PeerData *peer, MediaOverviewType type); // returns scroll shift
|
||||
|
||||
void requestHeight(int32 newHeight);
|
||||
int32 countMinHeight();
|
||||
void allowDecreaseHeight(int32 decreaseBy);
|
||||
|
||||
~ProfileInner();
|
||||
|
||||
// ClickHandlerHost interface
|
||||
void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) override;
|
||||
void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) override;
|
||||
|
||||
public slots:
|
||||
|
||||
void peerUpdated(PeerData *data);
|
||||
void updateSelected();
|
||||
|
||||
void openContextImage();
|
||||
void deleteContextImage();
|
||||
|
||||
void onShareContact();
|
||||
void onInviteToGroup();
|
||||
void onSendMessage();
|
||||
void onSearchInPeer();
|
||||
void onConvertToSupergroup();
|
||||
void onEnableNotifications();
|
||||
|
||||
void onClearHistory();
|
||||
void onClearHistorySure();
|
||||
void onDeleteConversation();
|
||||
void onDeleteConversationSure();
|
||||
void onDeleteChannel();
|
||||
void onDeleteChannelSure();
|
||||
void onBlockUser();
|
||||
void onAddParticipant();
|
||||
void onMigrate();
|
||||
void onMigrateSure();
|
||||
|
||||
void onUpdatePhoto();
|
||||
void onUpdatePhotoCancel();
|
||||
|
||||
void onPhotoUpdateDone(PeerId peer);
|
||||
void onPhotoUpdateFail(PeerId peer);
|
||||
void onPhotoUpdateStart();
|
||||
|
||||
void onKickConfirm();
|
||||
|
||||
void onMediaPhotos();
|
||||
void onMediaVideos();
|
||||
void onMediaSongs();
|
||||
void onMediaDocuments();
|
||||
void onMediaAudios();
|
||||
void onMediaLinks();
|
||||
|
||||
void onMenuDestroy(QObject *obj);
|
||||
void onCopyFullName();
|
||||
void onCopyPhone();
|
||||
void onCopyUsername();
|
||||
|
||||
void onInvitationLink();
|
||||
void onCreateInvitationLink();
|
||||
void onCreateInvitationLinkSure();
|
||||
void onPublicLink();
|
||||
|
||||
void onMembers();
|
||||
void onAdmins();
|
||||
|
||||
void onFullPeerUpdated(PeerData *peer);
|
||||
|
||||
void onBotSettings();
|
||||
void onBotHelp();
|
||||
void onPinnedMessage();
|
||||
|
||||
void onUpdateDelayed();
|
||||
|
||||
private:
|
||||
|
||||
void showAll();
|
||||
void updateInvitationLink();
|
||||
void updateBotLinksVisibility();
|
||||
void updatePinnedMessageVisibility();
|
||||
|
||||
void chatInviteDone(const MTPExportedChatInvite &result);
|
||||
bool updateMediaLinks(int32 *addToScroll = 0); // returns if anything changed
|
||||
|
||||
void migrateDone(const MTPUpdates &updates);
|
||||
bool migrateFail(const RPCError &error);
|
||||
|
||||
ProfileWidget *_profile;
|
||||
|
||||
PeerData *_peer;
|
||||
UserData *_peerUser;
|
||||
ChatData *_peerChat;
|
||||
ChannelData *_peerChannel;
|
||||
History *_migrated, *_history;
|
||||
bool _amCreator;
|
||||
|
||||
int32 _width, _left, _addToHeight;
|
||||
|
||||
// profile
|
||||
Text _nameText;
|
||||
QString _nameCache;
|
||||
QString _phoneText;
|
||||
ClickHandlerPtr _photoLink;
|
||||
FlatButton _uploadPhoto, _addParticipant;
|
||||
FlatButton _sendMessage, _shareContact, _inviteToGroup;
|
||||
LinkButton _cancelPhoto, _createInvitationLink, _invitationLink;
|
||||
QString _invitationText;
|
||||
LinkButton _botSettings, _botHelp, _pinnedMessage, _username, _members, _admins;
|
||||
|
||||
Text _about;
|
||||
int32 _aboutTop, _aboutHeight;
|
||||
|
||||
anim::fvalue a_photoOver;
|
||||
Animation _a_photo;
|
||||
bool _photoOver;
|
||||
|
||||
QString _errorText;
|
||||
|
||||
// migrate to megagroup
|
||||
bool _showMigrate, _forceShowMigrate;
|
||||
Text _aboutMigrate;
|
||||
FlatButton _migrate;
|
||||
|
||||
// settings
|
||||
FlatCheckbox _enableNotifications;
|
||||
|
||||
// shared media
|
||||
bool _notAllMediaLoaded;
|
||||
LinkButton *_mediaButtons[OverviewCount];
|
||||
QString overviewLinkText(int32 type, int32 count);
|
||||
|
||||
// actions
|
||||
LinkButton _searchInPeer, _convertToSupergroup, _clearHistory, _deleteConversation;
|
||||
//UserBlockedStatus _wasBlocked;
|
||||
mtpRequestId _blockRequest;
|
||||
LinkButton _blockUser, _deleteChannel;
|
||||
bool canDeleteChannel() const;
|
||||
|
||||
// participants
|
||||
int32 _pHeight;
|
||||
int32 _kickWidth, _selectedRow, _lastPreload;
|
||||
uint64 _contactId;
|
||||
UserData *_kickOver, *_kickDown, *_kickConfirm;
|
||||
|
||||
struct ParticipantData {
|
||||
Text name;
|
||||
QString online;
|
||||
bool cankick, admin;
|
||||
};
|
||||
typedef QVector<UserData*> Participants;
|
||||
Participants _participants;
|
||||
typedef QVector<ParticipantData*> ParticipantsData;
|
||||
ParticipantsData _participantsData;
|
||||
|
||||
QPoint _lastPos;
|
||||
|
||||
QString _onlineText;
|
||||
PopupMenu *_menu;
|
||||
|
||||
QString _secretText;
|
||||
|
||||
bool _updateDelayed;
|
||||
|
||||
void blockDone(bool blocked, const MTPBool &result);
|
||||
bool blockFail(const RPCError &error);
|
||||
|
||||
};
|
||||
|
||||
class ProfileWidget : public TWidget, public RPCSender {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
|
||||
ProfileWidget(QWidget *parent, PeerData *peer);
|
||||
|
||||
void resizeEvent(QResizeEvent *e) override;
|
||||
void mousePressEvent(QMouseEvent *e) override;
|
||||
void paintEvent(QPaintEvent *e) override;
|
||||
void dragEnterEvent(QDragEnterEvent *e) override;
|
||||
void dropEvent(QDropEvent *e) override;
|
||||
void keyPressEvent(QKeyEvent *e) override;
|
||||
|
||||
void paintTopBar(Painter &p, float64 over, int32 decreaseWidth);
|
||||
void topBarClick();
|
||||
|
||||
PeerData *peer() const;
|
||||
int32 lastScrollTop() const;
|
||||
|
||||
void animShow(const QPixmap &oldAnimCache, const QPixmap &bgAnimTopBarCache, bool back = false, int32 lastScrollTop = -1);
|
||||
void step_show(float64 ms, bool timer);
|
||||
|
||||
void updateOnlineDisplay();
|
||||
void updateOnlineDisplayTimer();
|
||||
|
||||
void peerUsernameChanged();
|
||||
|
||||
void updateNotifySettings();
|
||||
void mediaOverviewUpdated(PeerData *peer, MediaOverviewType type);
|
||||
|
||||
void grabStart() override {
|
||||
_inGrab = true;
|
||||
resizeEvent(0);
|
||||
}
|
||||
void grabFinish() override {
|
||||
_inGrab = false;
|
||||
resizeEvent(0);
|
||||
}
|
||||
void rpcClear() override {
|
||||
_inner.rpcClear();
|
||||
RPCSender::rpcClear();
|
||||
}
|
||||
|
||||
PeerData *ui_getPeerForMouseAction();
|
||||
|
||||
void clear();
|
||||
~ProfileWidget();
|
||||
|
||||
public slots:
|
||||
|
||||
void activate();
|
||||
void onScroll();
|
||||
|
||||
private:
|
||||
|
||||
ScrollArea _scroll;
|
||||
ProfileInner _inner;
|
||||
|
||||
Animation _a_show;
|
||||
QPixmap _cacheUnder, _cacheOver, _cacheTopBarUnder, _cacheTopBarOver;
|
||||
anim::ivalue a_coordUnder, a_coordOver;
|
||||
anim::fvalue a_shadow;
|
||||
|
||||
PlainShadow _topShadow;
|
||||
bool _inGrab;
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -89,7 +89,6 @@ SOURCES += \
|
|||
./SourceFiles/mediaview.cpp \
|
||||
./SourceFiles/overviewwidget.cpp \
|
||||
./SourceFiles/passcodewidget.cpp \
|
||||
./SourceFiles/profilewidget.cpp \
|
||||
./SourceFiles/playerwidget.cpp \
|
||||
./SourceFiles/localimageloader.cpp \
|
||||
./SourceFiles/localstorage.cpp \
|
||||
|
|
@ -209,7 +208,6 @@ HEADERS += \
|
|||
./SourceFiles/mediaview.h \
|
||||
./SourceFiles/overviewwidget.h \
|
||||
./SourceFiles/passcodewidget.h \
|
||||
./SourceFiles/profilewidget.h \
|
||||
./SourceFiles/playerwidget.h \
|
||||
./SourceFiles/localimageloader.h \
|
||||
./SourceFiles/localstorage.h \
|
||||
|
|
|
|||
|
|
@ -386,10 +386,6 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Debug\moc_profilewidget.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Debug\moc_profile_actions_widget.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
|
|
@ -445,6 +441,10 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Debug\moc_report_box.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Debug\moc_scrollarea.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
|
|
@ -717,10 +717,6 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Deploy\moc_profilewidget.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Deploy\moc_profile_actions_widget.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
|
|
@ -776,6 +772,10 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Deploy\moc_report_box.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Deploy\moc_scrollarea.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
|
|
@ -1074,10 +1074,6 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Release\moc_profilewidget.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Release\moc_profile_actions_widget.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
|
|
@ -1133,6 +1129,10 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Release\moc_report_box.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Release\moc_scrollarea.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
|
|
@ -1204,6 +1204,7 @@
|
|||
<ClCompile Include="SourceFiles\boxes\passcodebox.cpp" />
|
||||
<ClCompile Include="SourceFiles\boxes\photocropbox.cpp" />
|
||||
<ClCompile Include="SourceFiles\boxes\photosendbox.cpp" />
|
||||
<ClCompile Include="SourceFiles\boxes\report_box.cpp" />
|
||||
<ClCompile Include="SourceFiles\boxes\sessionsbox.cpp" />
|
||||
<ClCompile Include="SourceFiles\boxes\stickersetbox.cpp" />
|
||||
<ClCompile Include="SourceFiles\boxes\usernamebox.cpp" />
|
||||
|
|
@ -1260,7 +1261,6 @@
|
|||
<ClCompile Include="SourceFiles\overview\overview_layout.cpp" />
|
||||
<ClCompile Include="SourceFiles\passcodewidget.cpp" />
|
||||
<ClCompile Include="SourceFiles\playerwidget.cpp" />
|
||||
<ClCompile Include="SourceFiles\profilewidget.cpp" />
|
||||
<ClCompile Include="SourceFiles\profile\profile_actions_widget.cpp" />
|
||||
<ClCompile Include="SourceFiles\profile\profile_block_widget.cpp" />
|
||||
<ClCompile Include="SourceFiles\profile\profile_cover.cpp" />
|
||||
|
|
@ -1413,6 +1413,20 @@
|
|||
<ClInclude Include="GeneratedFiles\styles\style_overview.h" />
|
||||
<ClInclude Include="GeneratedFiles\styles\style_profile.h" />
|
||||
<ClInclude Include="Resources\winrc\resource.h" />
|
||||
<CustomBuild Include="SourceFiles\boxes\report_box.h">
|
||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">Moc%27ing report_box.h...</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/boxes/report_box.h" -DAL_LIBTYPE_STATIC -DCUSTOM_API_ID -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore\5.6.0\QtCore" "-I$(QTDIR)\include\QtGui\5.6.0\QtGui" "-I.\..\..\Libraries\breakpad\src" "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\ThirdParty\minizip" "-I.\..\..\Libraries\openssl\Release\include"</Command>
|
||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing report_box.h...</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/boxes/report_box.h" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -D_SCL_SECURE_NO_WARNINGS "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore\5.6.0\QtCore" "-I$(QTDIR)\include\QtGui\5.6.0\QtGui" "-I.\..\..\Libraries\breakpad\src" "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\ThirdParty\minizip" "-I.\..\..\Libraries\openssl_debug\Debug\include"</Command>
|
||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing report_box.h...</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/boxes/report_box.h" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore\5.6.0\QtCore" "-I$(QTDIR)\include\QtGui\5.6.0\QtGui" "-I.\..\..\Libraries\breakpad\src" "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\ThirdParty\minizip" "-I.\..\..\Libraries\openssl\Release\include"</Command>
|
||||
</CustomBuild>
|
||||
<ClInclude Include="SourceFiles\core\click_handler.h" />
|
||||
<ClInclude Include="SourceFiles\core\click_handler_types.h" />
|
||||
<ClInclude Include="SourceFiles\core\observer.h" />
|
||||
|
|
@ -2465,20 +2479,6 @@
|
|||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="SourceFiles\profilewidget.h">
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing profilewidget.h...</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -D_SCL_SECURE_NO_WARNINGS "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore\5.6.0\QtCore" "-I$(QTDIR)\include\QtGui\5.6.0\QtGui" "-I.\..\..\Libraries\breakpad\src" "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\ThirdParty\minizip" "-I.\..\..\Libraries\openssl_debug\Debug\include" "-fstdafx.h" "-f../../SourceFiles/profilewidget.h"</Command>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing profilewidget.h...</Message>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">Moc%27ing profilewidget.h...</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore\5.6.0\QtCore" "-I$(QTDIR)\include\QtGui\5.6.0\QtGui" "-I.\..\..\Libraries\breakpad\src" "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\ThirdParty\minizip" "-I.\..\..\Libraries\openssl\Release\include" "-fstdafx.h" "-f../../SourceFiles/profilewidget.h"</Command>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DAL_LIBTYPE_STATIC -DCUSTOM_API_ID -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore\5.6.0\QtCore" "-I$(QTDIR)\include\QtGui\5.6.0\QtGui" "-I.\..\..\Libraries\breakpad\src" "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\ThirdParty\minizip" "-I.\..\..\Libraries\openssl\Release\include" "-fstdafx.h" "-f../../SourceFiles/profilewidget.h"</Command>
|
||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="SourceFiles\pspecific_win.h">
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing pspecific_win.h...</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
|
||||
|
|
|
|||
|
|
@ -141,9 +141,6 @@
|
|||
<ClCompile Include="SourceFiles\fileuploader.cpp">
|
||||
<Filter>SourceFiles</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="SourceFiles\profilewidget.cpp">
|
||||
<Filter>SourceFiles</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="SourceFiles\sysbuttons.cpp">
|
||||
<Filter>SourceFiles</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -225,15 +222,6 @@
|
|||
<ClCompile Include="GeneratedFiles\Release\moc_settingswidget.cpp">
|
||||
<Filter>GeneratedFiles\Release</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Deploy\moc_profilewidget.cpp">
|
||||
<Filter>GeneratedFiles\Deploy</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Debug\moc_profilewidget.cpp">
|
||||
<Filter>GeneratedFiles\Debug</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Release\moc_profilewidget.cpp">
|
||||
<Filter>GeneratedFiles\Release</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Deploy\moc_photosendbox.cpp">
|
||||
<Filter>GeneratedFiles\Deploy</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -1272,6 +1260,18 @@
|
|||
<ClCompile Include="GeneratedFiles\Release\moc_profile_shared_media_widget.cpp">
|
||||
<Filter>GeneratedFiles\Release</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Deploy\moc_report_box.cpp">
|
||||
<Filter>GeneratedFiles\Deploy</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="SourceFiles\boxes\report_box.cpp">
|
||||
<Filter>SourceFiles\boxes</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Debug\moc_report_box.cpp">
|
||||
<Filter>GeneratedFiles\Debug</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\Release\moc_report_box.cpp">
|
||||
<Filter>GeneratedFiles\Release</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="SourceFiles\stdafx.h">
|
||||
|
|
@ -1507,9 +1507,6 @@
|
|||
<CustomBuild Include="SourceFiles\fileuploader.h">
|
||||
<Filter>SourceFiles</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="SourceFiles\profilewidget.h">
|
||||
<Filter>SourceFiles</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="SourceFiles\sysbuttons.h">
|
||||
<Filter>SourceFiles</Filter>
|
||||
</CustomBuild>
|
||||
|
|
@ -1759,6 +1756,9 @@
|
|||
<CustomBuild Include="SourceFiles\profile\profile_shared_media_widget.h">
|
||||
<Filter>SourceFiles\profile</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="SourceFiles\boxes\report_box.h">
|
||||
<Filter>SourceFiles\boxes</Filter>
|
||||
</CustomBuild>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\langs\lang_it.strings">
|
||||
|
|
|
|||
|
|
@ -191,7 +191,6 @@
|
|||
832C50BFD7D09AF042A51D4F /* flatbutton.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = F1A04BDB750C2AE652797B04 /* flatbutton.cpp */; settings = {ATTRIBUTES = (); }; };
|
||||
8771A8C96E9C391044035D99 /* OpenGL.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = D4B32C2222F82AC56BADEB21 /* OpenGL.framework */; };
|
||||
8883FF366F2623E89D90A9E6 /* qgenericbearer in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 9A55B8F7C143D66AD9EAE304 /* qgenericbearer */; };
|
||||
89ADB41E48A3B5E24ABB626C /* profilewidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = CF32DF59C7823E4F3397EF3C /* profilewidget.cpp */; settings = {ATTRIBUTES = (); }; };
|
||||
8B22E794EFF0EAFF964A3043 /* introstart.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = C34459FA465B57DF4DB80D12 /* introstart.cpp */; settings = {ATTRIBUTES = (); }; };
|
||||
8B71D1C7BB9DCEE6511219C2 /* moc_flatlabel.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 2181F5E34DE0A4B2F811E2E2 /* moc_flatlabel.cpp */; settings = {ATTRIBUTES = (); }; };
|
||||
8C4BA0DB55E2C40DE5F5E990 /* moc_pspecific_mac.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 74772222DA764BE4623EAC5D /* moc_pspecific_mac.cpp */; settings = {ATTRIBUTES = (); }; };
|
||||
|
|
@ -232,7 +231,6 @@
|
|||
BE6AB9DF1C4880624131C669 /* Qt5Widgets in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 4689C06178B60B84E7F3A3B7 /* Qt5Widgets */; };
|
||||
C03447C9A7D9FF73463B8BB5 /* countryinput.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 3E329D4547CC23585307FA32 /* countryinput.cpp */; settings = {ATTRIBUTES = (); }; };
|
||||
C06DDE378A7AC1FA9E6FF69A /* qtiff in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = F2453BA07315EB9F34F1CD57 /* qtiff */; };
|
||||
C14E6C902F6435B3149ECD64 /* moc_profilewidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 48003469151B9DDE82E851FB /* moc_profilewidget.cpp */; settings = {ATTRIBUTES = (); }; };
|
||||
C1F9D5CA8AF3AD8EBC9D7310 /* moc_application.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = E181C525E21A16F2D4396CA7 /* moc_application.cpp */; settings = {ATTRIBUTES = (); }; };
|
||||
C329997D36D34D568CE16C9A /* moc_animation.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = A1479F94376F9732B57C69DB /* moc_animation.cpp */; settings = {ATTRIBUTES = (); }; };
|
||||
CCA737EE379CDB10CC9A0F23 /* AVFoundation.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 21F907AB8D19BD779147A085 /* AVFoundation.framework */; };
|
||||
|
|
@ -541,7 +539,6 @@
|
|||
206B4F5CBD5354BCE19FF32F /* countries.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = countries.h; path = SourceFiles/countries.h; sourceTree = "<absolute>"; };
|
||||
2181F5E34DE0A4B2F811E2E2 /* moc_flatlabel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_flatlabel.cpp; path = GeneratedFiles/Debug/moc_flatlabel.cpp; sourceTree = "<absolute>"; };
|
||||
21F907AB8D19BD779147A085 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = /System/Library/Frameworks/AVFoundation.framework; sourceTree = "<absolute>"; };
|
||||
220B97F8F62C720E6059A64B /* profilewidget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = profilewidget.h; path = SourceFiles/profilewidget.h; sourceTree = "<absolute>"; };
|
||||
24F7D3E789E91B10E422C116 /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = config.h; path = SourceFiles/config.h; sourceTree = "<absolute>"; };
|
||||
25CA12A22B83B0B038C5B5DE /* langloaderplain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = langloaderplain.h; path = SourceFiles/langloaderplain.h; sourceTree = "<absolute>"; };
|
||||
26083D8E535AFF927591E1A5 /* moc_contactsbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_contactsbox.cpp; path = GeneratedFiles/Debug/moc_contactsbox.cpp; sourceTree = "<absolute>"; };
|
||||
|
|
@ -568,7 +565,6 @@
|
|||
4604687EBA85611C9E8A9CDF /* button.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = button.h; path = SourceFiles/ui/button.h; sourceTree = "<absolute>"; };
|
||||
46292F489228B60010794CE4 /* moc_button.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_button.cpp; path = GeneratedFiles/Debug/moc_button.cpp; sourceTree = "<absolute>"; };
|
||||
4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "$(QT_PATH)/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
|
||||
48003469151B9DDE82E851FB /* moc_profilewidget.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_profilewidget.cpp; path = GeneratedFiles/Debug/moc_profilewidget.cpp; sourceTree = "<absolute>"; };
|
||||
4AF15B5A0A43EB62D6DAF211 /* libexif.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexif.a; path = "../../Libraries/libexif-0.6.20/libexif/.libs/libexif.a"; sourceTree = "<absolute>"; };
|
||||
4D1099F2D3696E8A0E17D37D /* session.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = session.h; path = SourceFiles/mtproto/session.h; sourceTree = "<absolute>"; };
|
||||
4D504A849F15EB58E53A4E5F /* title.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = title.h; path = SourceFiles/title.h; sourceTree = "<absolute>"; };
|
||||
|
|
@ -684,7 +680,6 @@
|
|||
CE0D5EFE401BF9815FACE579 /* pspecific_mac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = pspecific_mac.h; path = SourceFiles/pspecific_mac.h; sourceTree = "<absolute>"; };
|
||||
CE7FFE194127BD789A2C877A /* moc_confirmbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_confirmbox.cpp; path = GeneratedFiles/Debug/moc_confirmbox.cpp; sourceTree = "<absolute>"; };
|
||||
CF1690B68F3B278E78823DB9 /* history.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = history.h; path = SourceFiles/history.h; sourceTree = "<absolute>"; };
|
||||
CF32DF59C7823E4F3397EF3C /* profilewidget.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = profilewidget.cpp; path = SourceFiles/profilewidget.cpp; sourceTree = "<absolute>"; };
|
||||
D12A6BD8EE80B8B308E481AD /* moc_flattextarea.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_flattextarea.cpp; path = GeneratedFiles/Debug/moc_flattextarea.cpp; sourceTree = "<absolute>"; };
|
||||
D1C9C77F1318F5A55C9BF289 /* photosendbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = photosendbox.cpp; path = SourceFiles/boxes/photosendbox.cpp; sourceTree = "<absolute>"; };
|
||||
D3D1BE0BEA3AEE0551AD39AC /* qdds */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qdds; path = "$(QT_PATH)/plugins/imageformats/libqdds$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
|
||||
|
|
@ -1171,8 +1166,6 @@
|
|||
07DE92A21AA4924400A18F6F /* passcodewidget.h */,
|
||||
07B604301B46A0EC00CA29FE /* playerwidget.cpp */,
|
||||
07B604311B46A0EC00CA29FE /* playerwidget.h */,
|
||||
CF32DF59C7823E4F3397EF3C /* profilewidget.cpp */,
|
||||
220B97F8F62C720E6059A64B /* profilewidget.h */,
|
||||
83728F60A64483E0AA933D76 /* pspecific.h */,
|
||||
F4EECA1187A744AEF5165243 /* pspecific_mac.cpp */,
|
||||
CE0D5EFE401BF9815FACE579 /* pspecific_mac.h */,
|
||||
|
|
@ -1243,7 +1236,6 @@
|
|||
2C99425D7670941EAF07B453 /* moc_historywidget.cpp */,
|
||||
1FE45A67215BEA2434F588E8 /* moc_layerwidget.cpp */,
|
||||
07A6933419927B160099CB9F /* moc_mediaview.cpp */,
|
||||
48003469151B9DDE82E851FB /* moc_profilewidget.cpp */,
|
||||
1D7899ACAA9F973CADFA34C1 /* moc_localimageloader.cpp */,
|
||||
3A220FD1AE5AD9FE3DC073A4 /* moc_mainwidget.cpp */,
|
||||
93AFE74928551FC3D7E8390B /* moc_settingswidget.cpp */,
|
||||
|
|
@ -1637,7 +1629,6 @@
|
|||
078A2FCD1A811CA600CCC7A0 /* backgroundbox.cpp in Compile Sources */,
|
||||
37A3C6C782A0E4BC7B09536B /* langloaderplain.cpp in Compile Sources */,
|
||||
19A66ECD6EE2F8356F27D32D /* layerwidget.cpp in Compile Sources */,
|
||||
89ADB41E48A3B5E24ABB626C /* profilewidget.cpp in Compile Sources */,
|
||||
48D8FC93AA8FF5D184649F49 /* localimageloader.cpp in Compile Sources */,
|
||||
113AA97DEE7847C7D2DCFF71 /* logs.cpp in Compile Sources */,
|
||||
E3194392BD6D0726F75FA72E /* mainwidget.cpp in Compile Sources */,
|
||||
|
|
@ -1726,7 +1717,6 @@
|
|||
4B0036C794BEA27AF9419768 /* moc_layerwidget.cpp in Compile Sources */,
|
||||
07C8FE101CB80890007A8702 /* toast.cpp in Compile Sources */,
|
||||
077A4AF71CA41C38002188D2 /* connection_abstract.cpp in Compile Sources */,
|
||||
C14E6C902F6435B3149ECD64 /* moc_profilewidget.cpp in Compile Sources */,
|
||||
071AD8F81C5E99D6008C9E90 /* ioapi.c in Compile Sources */,
|
||||
074756191A1372C600CA07F7 /* moc_basic_types.cpp in Compile Sources */,
|
||||
98E4F55DB5D8E64AB9F08C83 /* moc_localimageloader.cpp in Compile Sources */,
|
||||
|
|
|
|||
|
|
@ -354,9 +354,6 @@ GeneratedFiles/Debug/moc_overviewwidget.cpp: SourceFiles/overviewwidget.h
|
|||
GeneratedFiles/Debug/moc_playerwidget.cpp: SourceFiles/playerwidget.h
|
||||
$(MOC_FILE) SourceFiles/playerwidget.h -o GeneratedFiles/Debug/moc_playerwidget.cpp
|
||||
|
||||
GeneratedFiles/Debug/moc_profilewidget.cpp: SourceFiles/profilewidget.h
|
||||
$(MOC_FILE) SourceFiles/profilewidget.h -o GeneratedFiles/Debug/moc_profilewidget.cpp
|
||||
|
||||
GeneratedFiles/Debug/moc_passcodewidget.cpp: SourceFiles/passcodewidget.h
|
||||
$(MOC_FILE) SourceFiles/passcodewidget.h -o GeneratedFiles/Debug/moc_passcodewidget.cpp
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue