diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt index f1502116b..b3b5711ab 100644 --- a/Telegram/Resources/style.txt +++ b/Telegram/Resources/style.txt @@ -2495,3 +2495,12 @@ editTextArea: InputArea(defaultInputArea) { textMargins: margins(1px, 6px, 1px, 4px); heightMax: 256px; } + +toastFont: normalFont; +toastMaxWidth: 480px; +toastMinMargin: 13px; +toastBg: medviewSaveMsg; +toastFg: #FFF; +toastPadding: margins(19px, 13px, 19px, 12px); +toastFadeInDuration: 200; +toastFadeOutDuration: 1000; \ No newline at end of file diff --git a/Telegram/SourceFiles/art/sprite.png b/Telegram/SourceFiles/art/sprite.png index d919c9f3a..b9c755857 100644 Binary files a/Telegram/SourceFiles/art/sprite.png and b/Telegram/SourceFiles/art/sprite.png differ diff --git a/Telegram/SourceFiles/art/sprite_200x.png b/Telegram/SourceFiles/art/sprite_200x.png index 0ceeb20dd..964c993cf 100644 Binary files a/Telegram/SourceFiles/art/sprite_200x.png and b/Telegram/SourceFiles/art/sprite_200x.png differ diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index ca7d158b5..b0ba36dd5 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -6301,7 +6301,7 @@ void HistoryLocation::initDimensions(const HistoryItem *parent) { } } -int32 HistoryLocation::resize(int32 width, const HistoryItem *parent) { +int HistoryLocation::resizeGetHeight(int width, const HistoryItem *parent) { bool bubble = parent->hasBubble(); _width = qMin(width, _maxw); diff --git a/Telegram/SourceFiles/history.h b/Telegram/SourceFiles/history.h index 2f9df55a5..82ed36eac 100644 --- a/Telegram/SourceFiles/history.h +++ b/Telegram/SourceFiles/history.h @@ -2679,7 +2679,7 @@ public: } void initDimensions(const HistoryItem *parent) override; - int32 resize(int32 width, const HistoryItem *parent); + int resizeGetHeight(int32 width, const HistoryItem *parent) override; void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override; void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 69773efc7..31ca53fb0 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -25,6 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "boxes/photosendbox.h" #include "ui/filedialog.h" #include "ui/style.h" +#include "ui/toast/toast.h" #include "inline_bots/inline_bot_result.h" #include "lang.h" #include "application.h" @@ -5210,7 +5211,13 @@ void HistoryWidget::botCallbackDone(BotCallbackInfo info, const MTPmessages_BotC if (answer.type() == mtpc_messages_botCallbackAnswer) { const auto &answerData(answer.c_messages_botCallbackAnswer()); if (answerData.has_message()) { - Ui::showLayer(new InformBox(qs(answerData.vmessage))); + if (answerData.is_alert()) { + Ui::showLayer(new InformBox(qs(answerData.vmessage))); + } else { + Ui::Toast::Config toast; + toast.text = qs(answerData.vmessage); + Ui::Toast::Show(toast); + } } } } diff --git a/Telegram/SourceFiles/ui/toast/toast.cpp b/Telegram/SourceFiles/ui/toast/toast.cpp new file mode 100644 index 000000000..23ac4f737 --- /dev/null +++ b/Telegram/SourceFiles/ui/toast/toast.cpp @@ -0,0 +1,80 @@ +/* +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 "ui/toast/toast.h" + +#include "ui/toast/toast_manager.h" +#include "ui/toast/toast_widget.h" +#include "window.h" + +namespace Ui { +namespace Toast { + +Instance::Instance(const Config &config, QWidget *widgetParent, const Private &) + : _a_fade(animation(this, &Instance::step_fade)) + , _hideAtMs(getms(true) + config.durationMs) { + _widget = MakeUnique(widgetParent, config); + _a_fade.start(); +} + +void Show(const Config &config) { + if (internal::Manager *manager = internal::Manager::instance()) { + if (Window *window = App::wnd()) { + auto toast = MakeUnique(config, window, Instance::Private()); + manager->addToast(std_::move(toast)); + } + } +} + +void Instance::fadeOut() { + _fadingOut = true; + _a_fade.start(); +} + +void Instance::hide() { + _widget->hide(); + _widget->deleteLater(); +} + +void Instance::step_fade(float64 ms, bool timer) { + if (timer) { + _widget->update(); + } + if (_fadingOut) { + if (ms >= st::toastFadeOutDuration) { + hide(); + } else { + float64 dt = ms / st::toastFadeOutDuration; + _widget->setShownLevel(1. - dt); + } + } else { + if (ms >= st::toastFadeInDuration) { + _widget->setShownLevel(1.); + _a_fade.stop(); + } else { + float64 dt = ms / st::toastFadeInDuration; + _widget->setShownLevel(dt); + } + } +} + +} // namespace Toast +} // namespace Ui diff --git a/Telegram/SourceFiles/ui/toast/toast.h b/Telegram/SourceFiles/ui/toast/toast.h new file mode 100644 index 000000000..b6c4f6512 --- /dev/null +++ b/Telegram/SourceFiles/ui/toast/toast.h @@ -0,0 +1,66 @@ +/* +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 + +namespace Ui { +namespace Toast { + +namespace internal { + class Manager; + class Widget; +} // namespace internal + +static constexpr const int DefaultDuration = 1500; +struct Config { + QString text; + int durationMs = DefaultDuration; +}; +void Show(const Config &config); + +class Instance { + struct Private { + }; + +public: + + Instance(const Config &config, QWidget *widgetParent, const Private &); + Instance(const Instance &other) = delete; + Instance &operator=(const Instance &other) = delete; + + void fadeOut(); + void hide(); + +private: + void step_fade(float64 ms, bool timer); + bool _fadingOut = false; + Animation _a_fade; + + const uint64 _hideAtMs; + + // ToastManager should reset _widget pointer if _widget is destroyed. + friend class internal::Manager; + friend void Show(const Config &config); + UniquePointer _widget; + +}; + +} // namespace Toast +} // namespace Ui diff --git a/Telegram/SourceFiles/ui/toast/toast_manager.cpp b/Telegram/SourceFiles/ui/toast/toast_manager.cpp new file mode 100644 index 000000000..e3c37aebd --- /dev/null +++ b/Telegram/SourceFiles/ui/toast/toast_manager.cpp @@ -0,0 +1,123 @@ +/* +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 "ui/toast/toast_manager.h" + +#include "ui/toast/toast_widget.h" +#include "window.h" + +namespace Ui { +namespace Toast { +namespace internal { + +Manager *Manager::_instance = nullptr; + +Manager::Manager(QObject *parent) : QObject(parent) { + t_assert(_instance == nullptr); + _instance = this; + + connect(&_hideTimer, SIGNAL(timeout()), this, SLOT(onHideTimeout())); + connect(parent, SIGNAL(resized()), this, SLOT(onParentResized())); +} + +Manager *Manager::instance() { + if (!_instance) { + if (Window *w = App::wnd()) { + _instance = new Manager(w); + } + } + return _instance; +} + +void Manager::addToast(UniquePointer &&toast) { + _toasts.push_back(toast.release()); + Instance *t = _toasts.back(); + Widget *widget = t->_widget.data(); + + _toastByWidget.insert(widget, t); + connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(onToastWidgetDestroyed(QObject*))); + connect(widget->parentWidget(), SIGNAL(resized(QSize)), this, SLOT(onToastWidgetParentResized()), Qt::UniqueConnection); + + uint64 oldHideNearestMs = _toastByHideTime.isEmpty() ? 0 : _toastByHideTime.firstKey(); + _toastByHideTime.insert(t->_hideAtMs, t); + if (!oldHideNearestMs || _toastByHideTime.firstKey() < oldHideNearestMs) { + startNextHideTimer(); + } +} + +void Manager::onHideTimeout() { + uint64 now = getms(true); + for (auto i = _toastByHideTime.begin(); i != _toastByHideTime.cend();) { + if (i.key() <= now) { + Instance *toast = i.value(); + i = _toastByHideTime.erase(i); + toast->fadeOut(); + } else { + break; + } + } + startNextHideTimer(); +} + +void Manager::onToastWidgetDestroyed(QObject *widget) { + auto i = _toastByWidget.find(static_cast(widget)); + if (i != _toastByWidget.cend()) { + Instance *toast = i.value(); + _toastByWidget.erase(i); + toast->_widget.release(); + + int index = _toasts.indexOf(toast); + if (index >= 0) { + _toasts.removeAt(index); + delete toast; + } + } +} + +void Manager::onToastWidgetParentResized() { + QObject *resizedWidget = QObject::sender(); + if (!resizedWidget) return; + + for (auto i = _toastByWidget.cbegin(), e = _toastByWidget.cend(); i != e; ++i) { + if (i.key()->parentWidget() == resizedWidget) { + i.key()->onParentResized(); + } + } +} + +void Manager::startNextHideTimer() { + if (_toastByHideTime.isEmpty()) return; + + uint64 ms = getms(true); + if (ms >= _toastByHideTime.firstKey()) { + QMetaObject::invokeMethod(this, SLOT("onHideTimeout"), Qt::QueuedConnection); + } else { + _hideTimer.start(_toastByHideTime.firstKey() - ms); + } +} + +Manager::~Manager() { + _instance = nullptr; +} + +} // namespace internal +} // namespace Toast +} // namespace Ui diff --git a/Telegram/SourceFiles/ui/toast/toast_manager.h b/Telegram/SourceFiles/ui/toast/toast_manager.h new file mode 100644 index 000000000..d8d98c208 --- /dev/null +++ b/Telegram/SourceFiles/ui/toast/toast_manager.h @@ -0,0 +1,65 @@ +/* +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 "ui/toast/toast.h" + +namespace Ui { +namespace Toast { +namespace internal { + +class Widget; +class Manager : public QObject { + Q_OBJECT + +public: + Manager(const Manager &other) = delete; + Manager &operator=(const Manager &other) = delete; + + static Manager *instance(); + + void addToast(UniquePointer &&toast); + + ~Manager(); + +private slots: + void onHideTimeout(); + void onToastWidgetDestroyed(QObject *widget); + void onToastWidgetParentResized(); + +private: + Manager(QObject *parent); + void startNextHideTimer(); + + SingleTimer _hideTimer; + uint64 _nextHide = 0; + + QMultiMap _toastByHideTime; + QMap _toastByWidget; + QList _toasts; + + static Manager *_instance; + +}; + +} // namespace internal +} // namespace Toast +} // namespace Ui diff --git a/Telegram/SourceFiles/ui/toast/toast_widget.cpp b/Telegram/SourceFiles/ui/toast/toast_widget.cpp new file mode 100644 index 000000000..69c98ebda --- /dev/null +++ b/Telegram/SourceFiles/ui/toast/toast_widget.cpp @@ -0,0 +1,64 @@ +/* +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 "ui/toast/toast_widget.h" + +namespace Ui { +namespace Toast { +namespace internal { + +Widget::Widget(QWidget *parent, const Config &config) : TWidget(parent) { + TextParseOptions toastOptions = { 0, int(st::toastMaxWidth), st::toastFont->height, Qt::LayoutDirectionAuto }; + _text.setText(st::toastFont, textOneLine(config.text), toastOptions); + + setAttribute(Qt::WA_TransparentForMouseEvents); + + onParentResized(); + show(); +} + +void Widget::onParentResized() { + int width = st::toastMaxWidth; + accumulate_min(width, st::toastPadding.left() + _text.maxWidth() + st::toastPadding.right()); + accumulate_min(width, parentWidget()->width() - 2 * int(st::toastMinMargin)); + int height = st::toastPadding.top() + _text.minHeight() + st::toastPadding.bottom(); + setGeometry((parentWidget()->width() - width) / 2, (parentWidget()->height() - height) / 2, width, height); +} + +void Widget::setShownLevel(float64 shownLevel) { + _shownLevel = shownLevel; +} + +void Widget::paintEvent(QPaintEvent *e) { + Painter p(this); + + p.setOpacity(_shownLevel); + App::roundRect(p, rect(), st::toastBg); + + p.setPen(st::toastFg); + textstyleSet(&st::defaultTextStyle); + _text.drawElided(p, st::toastPadding.left(), st::toastPadding.top(), width() - st::toastPadding.left() - st::toastPadding.right()); + textstyleRestore(); +} + +} // namespace internal +} // namespace Toast +} // namespace Ui diff --git a/Telegram/SourceFiles/ui/toast/toast_widget.h b/Telegram/SourceFiles/ui/toast/toast_widget.h new file mode 100644 index 000000000..4ee46f599 --- /dev/null +++ b/Telegram/SourceFiles/ui/toast/toast_widget.h @@ -0,0 +1,51 @@ +/* +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 "ui/toast/toast.h" +#include "ui/twidget.h" +#include "ui/text.h" + +namespace Ui { +namespace Toast { +namespace internal { + +class Widget : public TWidget { +public: + Widget(QWidget *parent, const Config &config); + + // shownLevel=1 completely visible, shownLevel=0 completely invisible + void setShownLevel(float64 shownLevel); + + void onParentResized(); + +protected: + void paintEvent(QPaintEvent *e) override; + +private: + float64 _shownLevel = 0; + Text _text; + +}; + +} // namespace internal +} // namespace Toast +} // namespace Ui diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro index fd33b1518..92d8a51a4 100644 --- a/Telegram/Telegram.pro +++ b/Telegram/Telegram.pro @@ -128,6 +128,9 @@ SOURCES += \ ./SourceFiles/mtproto/rpc_sender.cpp \ ./SourceFiles/mtproto/scheme_auto.cpp \ ./SourceFiles/mtproto/session.cpp \ + ./SourceFiles/ui/toast/toast.cpp \ + ./SourceFiles/ui/toast/toast_manager.cpp \ + ./SourceFiles/ui/toast/toast_widget.cpp \ ./SourceFiles/ui/animation.cpp \ ./SourceFiles/ui/boxshadow.cpp \ ./SourceFiles/ui/button.cpp \ @@ -229,6 +232,9 @@ HEADERS += \ ./SourceFiles/mtproto/scheme_auto.h \ ./SourceFiles/mtproto/session.h \ ./SourceFiles/pspecific.h \ + ./SourceFiles/ui/toast/toast.h \ + ./SourceFiles/ui/toast/toast_manager.h \ + ./SourceFiles/ui/toast/toast_widget.h \ ./SourceFiles/ui/animation.h \ ./SourceFiles/ui/boxshadow.h \ ./SourceFiles/ui/button.h \ diff --git a/Telegram/Telegram.vcxproj b/Telegram/Telegram.vcxproj index 976bfd7a0..a5e72354e 100644 --- a/Telegram/Telegram.vcxproj +++ b/Telegram/Telegram.vcxproj @@ -432,6 +432,10 @@ true true + + true + true + true true @@ -711,6 +715,10 @@ true true + + true + true + true true @@ -1016,6 +1024,10 @@ true true + + true + true + true true @@ -1139,6 +1151,9 @@ + + + @@ -1476,6 +1491,22 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/ui/twidget.h" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl\Release\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" + + + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing toast_manager.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/ui/toast/toast_manager.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.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl\Release\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing toast_manager.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/ui/toast/toast_manager.h" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl_debug\Debug\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing toast_manager.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/ui/toast/toast_manager.h" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl\Release\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" + + diff --git a/Telegram/Telegram.vcxproj.filters b/Telegram/Telegram.vcxproj.filters index 50641958e..7576a456f 100644 --- a/Telegram/Telegram.vcxproj.filters +++ b/Telegram/Telegram.vcxproj.filters @@ -55,6 +55,9 @@ {93203856-b459-49ec-8097-689d0feda013} + + {815de139-ef13-45d6-a131-a3556eefae55} + @@ -987,6 +990,24 @@ Generated Files\Release + + ui\toast + + + ui\toast + + + Generated Files\Deploy + + + Generated Files\Debug + + + Generated Files\Release + + + ui\toast + @@ -1097,6 +1118,12 @@ ui + + ui\toast + + + ui\toast + @@ -1336,6 +1363,9 @@ ui + + ui\toast + diff --git a/Telegram/Telegram.xcodeproj/qt_preprocess.mak b/Telegram/Telegram.xcodeproj/qt_preprocess.mak index 29f038dd6..266f75ccc 100644 --- a/Telegram/Telegram.xcodeproj/qt_preprocess.mak +++ b/Telegram/Telegram.xcodeproj/qt_preprocess.mak @@ -31,31 +31,75 @@ mocables: compiler_moc_header_make_all compiler_moc_source_make_all check: first -compilers: GeneratedFiles/qrc_telegram.cpp GeneratedFiles/qrc_telegram_emojis.cpp GeneratedFiles/qrc_telegram_mac.cpp GeneratedFiles/Debug/moc_apiwrap.cpp GeneratedFiles/Debug/moc_application.cpp GeneratedFiles/Debug/moc_audio.cpp GeneratedFiles/Debug/moc_autoupdater.cpp GeneratedFiles/Debug/moc_dialogswidget.cpp GeneratedFiles/Debug/moc_dropdown.cpp\ - GeneratedFiles/Debug/moc_fileuploader.cpp GeneratedFiles/Debug/moc_history.cpp GeneratedFiles/Debug/moc_historywidget.cpp GeneratedFiles/Debug/moc_layerwidget.cpp\ - GeneratedFiles/Debug/moc_mediaview.cpp GeneratedFiles/Debug/moc_overviewwidget.cpp GeneratedFiles/Debug/moc_playerwidget.cpp GeneratedFiles/Debug/moc_profilewidget.cpp\ +compilers: GeneratedFiles/qrc_telegram.cpp\ + GeneratedFiles/qrc_telegram_emojis.cpp\ + GeneratedFiles/qrc_telegram_mac.cpp\ + GeneratedFiles/Debug/moc_apiwrap.cpp\ + GeneratedFiles/Debug/moc_application.cpp\ + GeneratedFiles/Debug/moc_audio.cpp\ + GeneratedFiles/Debug/moc_autoupdater.cpp\ + GeneratedFiles/Debug/moc_dialogswidget.cpp\ + GeneratedFiles/Debug/moc_dropdown.cpp\ + GeneratedFiles/Debug/moc_fileuploader.cpp\ + GeneratedFiles/Debug/moc_history.cpp\ + GeneratedFiles/Debug/moc_historywidget.cpp\ + GeneratedFiles/Debug/moc_layerwidget.cpp\ + GeneratedFiles/Debug/moc_mediaview.cpp\ + GeneratedFiles/Debug/moc_overviewwidget.cpp\ + GeneratedFiles/Debug/moc_playerwidget.cpp\ + GeneratedFiles/Debug/moc_profilewidget.cpp\ GeneratedFiles/Debug/moc_passcodewidget.cpp\ - GeneratedFiles/Debug/moc_localimageloader.cpp GeneratedFiles/Debug/moc_localstorage.cpp GeneratedFiles/Debug/moc_mainwidget.cpp\ - GeneratedFiles/Debug/moc_settingswidget.cpp GeneratedFiles/Debug/moc_sysbuttons.cpp GeneratedFiles/Debug/moc_title.cpp\ - GeneratedFiles/Debug/moc_basic_types.cpp GeneratedFiles/Debug/moc_window.cpp GeneratedFiles/Debug/moc_facade.cpp GeneratedFiles/Debug/moc_connection.cpp\ + GeneratedFiles/Debug/moc_localimageloader.cpp\ + GeneratedFiles/Debug/moc_localstorage.cpp\ + GeneratedFiles/Debug/moc_mainwidget.cpp\ + GeneratedFiles/Debug/moc_settingswidget.cpp\ + GeneratedFiles/Debug/moc_sysbuttons.cpp\ + GeneratedFiles/Debug/moc_title.cpp\ + GeneratedFiles/Debug/moc_basic_types.cpp\ + GeneratedFiles/Debug/moc_window.cpp\ + GeneratedFiles/Debug/moc_facade.cpp\ + GeneratedFiles/Debug/moc_connection.cpp\ GeneratedFiles/Debug/moc_connection_abstract.cpp\ GeneratedFiles/Debug/moc_connection_auto.cpp\ GeneratedFiles/Debug/moc_connection_http.cpp\ GeneratedFiles/Debug/moc_connection_tcp.cpp\ - GeneratedFiles/Debug/moc_dcenter.cpp GeneratedFiles/Debug/moc_file_download.cpp GeneratedFiles/Debug/moc_session.cpp\ - GeneratedFiles/Debug/moc_animation.cpp GeneratedFiles/Debug/moc_button.cpp\ + GeneratedFiles/Debug/moc_dcenter.cpp\ + GeneratedFiles/Debug/moc_file_download.cpp\ + GeneratedFiles/Debug/moc_session.cpp\ + GeneratedFiles/Debug/moc_animation.cpp\ + GeneratedFiles/Debug/moc_toast_manager.cpp\ + GeneratedFiles/Debug/moc_button.cpp\ GeneratedFiles/Debug/moc_popupmenu.cpp\ - GeneratedFiles/Debug/moc_countryinput.cpp GeneratedFiles/Debug/moc_flatbutton.cpp GeneratedFiles/Debug/moc_flatcheckbox.cpp\ - GeneratedFiles/Debug/moc_flatinput.cpp GeneratedFiles/Debug/moc_flatlabel.cpp GeneratedFiles/Debug/moc_flattextarea.cpp\ - GeneratedFiles/Debug/moc_scrollarea.cpp GeneratedFiles/Debug/moc_twidget.cpp\ - GeneratedFiles/Debug/moc_aboutbox.cpp GeneratedFiles/Debug/moc_abstractbox.cpp GeneratedFiles/Debug/moc_addcontactbox.cpp\ + GeneratedFiles/Debug/moc_countryinput.cpp\ + GeneratedFiles/Debug/moc_flatbutton.cpp\ + GeneratedFiles/Debug/moc_flatcheckbox.cpp\ + GeneratedFiles/Debug/moc_flatinput.cpp\ + GeneratedFiles/Debug/moc_flatlabel.cpp\ + GeneratedFiles/Debug/moc_flattextarea.cpp\ + GeneratedFiles/Debug/moc_scrollarea.cpp\ + GeneratedFiles/Debug/moc_twidget.cpp\ + GeneratedFiles/Debug/moc_aboutbox.cpp\ + GeneratedFiles/Debug/moc_abstractbox.cpp\ + GeneratedFiles/Debug/moc_addcontactbox.cpp\ GeneratedFiles/Debug/moc_autolockbox.cpp\ GeneratedFiles/Debug/moc_backgroundbox.cpp\ - GeneratedFiles/Debug/moc_confirmbox.cpp GeneratedFiles/Debug/moc_connectionbox.cpp GeneratedFiles/Debug/moc_contactsbox.cpp\ - GeneratedFiles/Debug/moc_downloadpathbox.cpp GeneratedFiles/Debug/moc_emojibox.cpp GeneratedFiles/Debug/moc_languagebox.cpp\ + GeneratedFiles/Debug/moc_confirmbox.cpp\ + GeneratedFiles/Debug/moc_connectionbox.cpp\ + GeneratedFiles/Debug/moc_contactsbox.cpp\ + GeneratedFiles/Debug/moc_downloadpathbox.cpp\ + GeneratedFiles/Debug/moc_emojibox.cpp\ + GeneratedFiles/Debug/moc_languagebox.cpp\ GeneratedFiles/Debug/moc_passcodebox.cpp\ - GeneratedFiles/Debug/moc_photocropbox.cpp GeneratedFiles/Debug/moc_photosendbox.cpp GeneratedFiles/Debug/moc_sessionsbox.cpp GeneratedFiles/Debug/moc_stickersetbox.cpp GeneratedFiles/Debug/moc_usernamebox.cpp GeneratedFiles/Debug/moc_introwidget.cpp\ - GeneratedFiles/Debug/moc_introcode.cpp GeneratedFiles/Debug/moc_introphone.cpp GeneratedFiles/Debug/moc_intropwdcheck.cpp GeneratedFiles/Debug/moc_introsignup.cpp\ + GeneratedFiles/Debug/moc_photocropbox.cpp\ + GeneratedFiles/Debug/moc_photosendbox.cpp\ + GeneratedFiles/Debug/moc_sessionsbox.cpp\ + GeneratedFiles/Debug/moc_stickersetbox.cpp\ + GeneratedFiles/Debug/moc_usernamebox.cpp\ + GeneratedFiles/Debug/moc_introwidget.cpp\ + GeneratedFiles/Debug/moc_introcode.cpp\ + GeneratedFiles/Debug/moc_introphone.cpp\ + GeneratedFiles/Debug/moc_intropwdcheck.cpp\ + GeneratedFiles/Debug/moc_introsignup.cpp\ GeneratedFiles/Debug/moc_pspecific_mac.cpp compiler_objective_c_make_all: compiler_objective_c_clean: @@ -103,9 +147,141 @@ GeneratedFiles/qrc_telegram_mac.cpp: SourceFiles/telegram_mac.qrc \ SourceFiles/art/osxtray.png /usr/local/Qt-5.5.1/bin/rcc -name telegram_mac SourceFiles/telegram_mac.qrc -o GeneratedFiles/qrc_telegram_mac.cpp -compiler_moc_header_make_all: GeneratedFiles/Debug/moc_apiwrap.cpp GeneratedFiles/Debug/moc_application.cpp GeneratedFiles/Debug/moc_audio.cpp GeneratedFiles/Debug/moc_autoupdater.cpp GeneratedFiles/Debug/moc_dialogswidget.cpp GeneratedFiles/Debug/moc_dropdown.cpp GeneratedFiles/Debug/moc_fileuploader.cpp GeneratedFiles/Debug/moc_history.cpp GeneratedFiles/Debug/moc_historywidget.cpp GeneratedFiles/Debug/moc_layerwidget.cpp GeneratedFiles/Debug/moc_mediaview.cpp GeneratedFiles/Debug/moc_overviewwidget.cpp GeneratedFiles/Debug/moc_playerwidget.cpp GeneratedFiles/Debug/moc_profilewidget.cpp GeneratedFiles/Debug/moc_passcodewidget.cpp GeneratedFiles/Debug/moc_localimageloader.cpp GeneratedFiles/Debug/moc_localstorage.cpp GeneratedFiles/Debug/moc_mainwidget.cpp GeneratedFiles/Debug/moc_settingswidget.cpp GeneratedFiles/Debug/moc_sysbuttons.cpp GeneratedFiles/Debug/moc_title.cpp GeneratedFiles/Debug/moc_basic_types.cpp GeneratedFiles/Debug/moc_window.cpp GeneratedFiles/Debug/moc_facade.cpp GeneratedFiles/Debug/moc_connection.cpp GeneratedFiles/Debug/moc_connection_abstract.cpp GeneratedFiles/Debug/moc_connection_auto.cpp GeneratedFiles/Debug/moc_connection_http.cpp GeneratedFiles/Debug/moc_connection_tcp.cpp GeneratedFiles/Debug/moc_dcenter.cpp GeneratedFiles/Debug/moc_file_download.cpp GeneratedFiles/Debug/moc_session.cpp GeneratedFiles/Debug/moc_animation.cpp GeneratedFiles/Debug/moc_button.cpp GeneratedFiles/Debug/moc_popupmenu.cpp GeneratedFiles/Debug/moc_countryinput.cpp GeneratedFiles/Debug/moc_flatbutton.cpp GeneratedFiles/Debug/moc_flatcheckbox.cpp GeneratedFiles/Debug/moc_flatinput.cpp GeneratedFiles/Debug/moc_flatlabel.cpp GeneratedFiles/Debug/moc_flattextarea.cpp GeneratedFiles/Debug/moc_scrollarea.cpp GeneratedFiles/Debug/moc_twidget.cpp GeneratedFiles/Debug/moc_aboutbox.cpp GeneratedFiles/Debug/moc_abstractbox.cpp GeneratedFiles/Debug/moc_addcontactbox.cpp GeneratedFiles/Debug/moc_autolockbox.cpp GeneratedFiles/Debug/moc_backgroundbox.cpp GeneratedFiles/Debug/moc_confirmbox.cpp GeneratedFiles/Debug/moc_connectionbox.cpp GeneratedFiles/Debug/moc_contactsbox.cpp GeneratedFiles/Debug/moc_downloadpathbox.cpp GeneratedFiles/Debug/moc_emojibox.cpp GeneratedFiles/Debug/moc_languagebox.cpp GeneratedFiles/Debug/moc_passcodebox.cpp GeneratedFiles/Debug/moc_photocropbox.cpp GeneratedFiles/Debug/moc_photosendbox.cpp GeneratedFiles/Debug/moc_sessionsbox.cpp GeneratedFiles/Debug/moc_stickersetbox.cpp GeneratedFiles/Debug/moc_usernamebox.cpp GeneratedFiles/Debug/moc_introwidget.cpp GeneratedFiles/Debug/moc_introcode.cpp GeneratedFiles/Debug/moc_introphone.cpp GeneratedFiles/Debug/moc_intropwdcheck.cpp GeneratedFiles/Debug/moc_introsignup.cpp GeneratedFiles/Debug/moc_pspecific_mac.cpp +compiler_moc_header_make_all: GeneratedFiles/Debug/moc_apiwrap.cpp\ + GeneratedFiles/Debug/moc_application.cpp\ + GeneratedFiles/Debug/moc_audio.cpp\ + GeneratedFiles/Debug/moc_autoupdater.cpp\ + GeneratedFiles/Debug/moc_dialogswidget.cpp\ + GeneratedFiles/Debug/moc_dropdown.cpp\ + GeneratedFiles/Debug/moc_fileuploader.cpp\ + GeneratedFiles/Debug/moc_history.cpp\ + GeneratedFiles/Debug/moc_historywidget.cpp\ + GeneratedFiles/Debug/moc_layerwidget.cpp\ + GeneratedFiles/Debug/moc_mediaview.cpp\ + GeneratedFiles/Debug/moc_overviewwidget.cpp\ + GeneratedFiles/Debug/moc_playerwidget.cpp\ + GeneratedFiles/Debug/moc_profilewidget.cpp\ + GeneratedFiles/Debug/moc_passcodewidget.cpp\ + GeneratedFiles/Debug/moc_localimageloader.cpp\ + GeneratedFiles/Debug/moc_localstorage.cpp\ + GeneratedFiles/Debug/moc_mainwidget.cpp\ + GeneratedFiles/Debug/moc_settingswidget.cpp\ + GeneratedFiles/Debug/moc_sysbuttons.cpp\ + GeneratedFiles/Debug/moc_title.cpp\ + GeneratedFiles/Debug/moc_basic_types.cpp\ + GeneratedFiles/Debug/moc_window.cpp\ + GeneratedFiles/Debug/moc_facade.cpp\ + GeneratedFiles/Debug/moc_connection.cpp\ + GeneratedFiles/Debug/moc_connection_abstract.cpp\ + GeneratedFiles/Debug/moc_connection_auto.cpp\ + GeneratedFiles/Debug/moc_connection_http.cpp\ + GeneratedFiles/Debug/moc_connection_tcp.cpp\ + GeneratedFiles/Debug/moc_dcenter.cpp\ + GeneratedFiles/Debug/moc_file_download.cpp\ + GeneratedFiles/Debug/moc_session.cpp\ + GeneratedFiles/Debug/moc_animation.cpp\ + GeneratedFiles/Debug/moc_toast_manager.cpp\ + GeneratedFiles/Debug/moc_button.cpp\ + GeneratedFiles/Debug/moc_popupmenu.cpp\ + GeneratedFiles/Debug/moc_countryinput.cpp\ + GeneratedFiles/Debug/moc_flatbutton.cpp\ + GeneratedFiles/Debug/moc_flatcheckbox.cpp\ + GeneratedFiles/Debug/moc_flatinput.cpp\ + GeneratedFiles/Debug/moc_flatlabel.cpp\ + GeneratedFiles/Debug/moc_flattextarea.cpp\ + GeneratedFiles/Debug/moc_scrollarea.cpp\ + GeneratedFiles/Debug/moc_twidget.cpp\ + GeneratedFiles/Debug/moc_aboutbox.cpp\ + GeneratedFiles/Debug/moc_abstractbox.cpp\ + GeneratedFiles/Debug/moc_addcontactbox.cpp\ + GeneratedFiles/Debug/moc_autolockbox.cpp\ + GeneratedFiles/Debug/moc_backgroundbox.cpp\ + GeneratedFiles/Debug/moc_confirmbox.cpp\ + GeneratedFiles/Debug/moc_connectionbox.cpp\ + GeneratedFiles/Debug/moc_contactsbox.cpp\ + GeneratedFiles/Debug/moc_downloadpathbox.cpp\ + GeneratedFiles/Debug/moc_emojibox.cpp\ + GeneratedFiles/Debug/moc_languagebox.cpp\ + GeneratedFiles/Debug/moc_passcodebox.cpp\ + GeneratedFiles/Debug/moc_photocropbox.cpp\ + GeneratedFiles/Debug/moc_photosendbox.cpp\ + GeneratedFiles/Debug/moc_sessionsbox.cpp\ + GeneratedFiles/Debug/moc_stickersetbox.cpp\ + GeneratedFiles/Debug/moc_usernamebox.cpp\ + GeneratedFiles/Debug/moc_introwidget.cpp\ + GeneratedFiles/Debug/moc_introcode.cpp\ + GeneratedFiles/Debug/moc_introphone.cpp\ + GeneratedFiles/Debug/moc_intropwdcheck.cpp\ + GeneratedFiles/Debug/moc_introsignup.cpp\ + GeneratedFiles/Debug/moc_pspecific_mac.cpp compiler_moc_header_clean: - -$(DEL_FILE) GeneratedFiles/Debug/moc_apiwrap.cpp GeneratedFiles/Debug/moc_application.cpp GeneratedFiles/Debug/moc_audio.cpp GeneratedFiles/Debug/moc_autoupdater.cpp GeneratedFiles/Debug/moc_dialogswidget.cpp GeneratedFiles/Debug/moc_dropdown.cpp GeneratedFiles/Debug/moc_fileuploader.cpp GeneratedFiles/Debug/moc_history.cpp GeneratedFiles/Debug/moc_historywidget.cpp GeneratedFiles/Debug/moc_layerwidget.cpp GeneratedFiles/Debug/moc_mediaview.cpp GeneratedFiles/Debug/moc_overviewwidget.cpp GeneratedFiles/Debug/moc_playerwidget.cpp GeneratedFiles/Debug/moc_profilewidget.cpp GeneratedFiles/Debug/moc_passcodewidget.cpp GeneratedFiles/Debug/moc_localimageloader.cpp GeneratedFiles/Debug/moc_localstorage.cpp GeneratedFiles/Debug/moc_mainwidget.cpp GeneratedFiles/Debug/moc_settingswidget.cpp GeneratedFiles/Debug/moc_sysbuttons.cpp GeneratedFiles/Debug/moc_title.cpp GeneratedFiles/Debug/moc_basic_types.cpp GeneratedFiles/Debug/moc_window.cpp GeneratedFiles/Debug/moc_facade.cpp GeneratedFiles/Debug/moc_connection.cpp GeneratedFiles/Debug/moc_connection_abstract.cpp GeneratedFiles/Debug/moc_connection_auto.cpp GeneratedFiles/Debug/moc_connection_http.cpp GeneratedFiles/Debug/moc_connection_tcp.cpp GeneratedFiles/Debug/moc_dcenter.cpp GeneratedFiles/Debug/moc_file_download.cpp GeneratedFiles/Debug/moc_session.cpp GeneratedFiles/Debug/moc_animation.cpp GeneratedFiles/Debug/moc_button.cpp GeneratedFiles/Debug/moc_popupmenu.cpp GeneratedFiles/Debug/moc_countryinput.cpp GeneratedFiles/Debug/moc_flatbutton.cpp GeneratedFiles/Debug/moc_flatcheckbox.cpp GeneratedFiles/Debug/moc_flatinput.cpp GeneratedFiles/Debug/moc_flatlabel.cpp GeneratedFiles/Debug/moc_flattextarea.cpp GeneratedFiles/Debug/moc_scrollarea.cpp GeneratedFiles/Debug/moc_twidget.cpp GeneratedFiles/Debug/moc_aboutbox.cpp GeneratedFiles/Debug/moc_abstractbox.cpp GeneratedFiles/Debug/moc_addcontactbox.cpp GeneratedFiles/Debug/moc_autolockbox.cpp GeneratedFiles/Debug/moc_backgroundbox.cpp GeneratedFiles/Debug/moc_confirmbox.cpp GeneratedFiles/Debug/moc_connectionbox.cpp GeneratedFiles/Debug/moc_contactsbox.cpp GeneratedFiles/Debug/moc_downloadpathbox.cpp GeneratedFiles/Debug/moc_emojibox.cpp GeneratedFiles/Debug/moc_languagebox.cpp GeneratedFiles/Debug/moc_passcodebox.cpp GeneratedFiles/Debug/moc_photocropbox.cpp GeneratedFiles/Debug/moc_photosendbox.cpp GeneratedFiles/Debug/moc_sessionsbox.cpp GeneratedFiles/Debug/moc_stickersetbox.cpp GeneratedFiles/Debug/moc_usernamedbox.cpp GeneratedFiles/Debug/moc_introwidget.cpp GeneratedFiles/Debug/moc_introcode.cpp GeneratedFiles/Debug/moc_introphone.cpp GeneratedFiles/Debug/moc_intropwdcheck.cpp GeneratedFiles/Debug/moc_introsignup.cpp GeneratedFiles/Debug/moc_pspecific_mac.cpp + -$(DEL_FILE) GeneratedFiles/Debug/moc_apiwrap.cpp\ + GeneratedFiles/Debug/moc_application.cpp\ + GeneratedFiles/Debug/moc_audio.cpp\ + GeneratedFiles/Debug/moc_autoupdater.cpp\ + GeneratedFiles/Debug/moc_dialogswidget.cpp\ + GeneratedFiles/Debug/moc_dropdown.cpp\ + GeneratedFiles/Debug/moc_fileuploader.cpp\ + GeneratedFiles/Debug/moc_history.cpp\ + GeneratedFiles/Debug/moc_historywidget.cpp\ + GeneratedFiles/Debug/moc_layerwidget.cpp\ + GeneratedFiles/Debug/moc_mediaview.cpp\ + GeneratedFiles/Debug/moc_overviewwidget.cpp\ + GeneratedFiles/Debug/moc_playerwidget.cpp\ + GeneratedFiles/Debug/moc_profilewidget.cpp\ + GeneratedFiles/Debug/moc_passcodewidget.cpp\ + GeneratedFiles/Debug/moc_localimageloader.cpp\ + GeneratedFiles/Debug/moc_localstorage.cpp\ + GeneratedFiles/Debug/moc_mainwidget.cpp\ + GeneratedFiles/Debug/moc_settingswidget.cpp\ + GeneratedFiles/Debug/moc_sysbuttons.cpp\ + GeneratedFiles/Debug/moc_title.cpp\ + GeneratedFiles/Debug/moc_basic_types.cpp\ + GeneratedFiles/Debug/moc_window.cpp\ + GeneratedFiles/Debug/moc_facade.cpp\ + GeneratedFiles/Debug/moc_connection.cpp\ + GeneratedFiles/Debug/moc_connection_abstract.cpp\ + GeneratedFiles/Debug/moc_connection_auto.cpp\ + GeneratedFiles/Debug/moc_connection_http.cpp\ + GeneratedFiles/Debug/moc_connection_tcp.cpp\ + GeneratedFiles/Debug/moc_dcenter.cpp\ + GeneratedFiles/Debug/moc_file_download.cpp\ + GeneratedFiles/Debug/moc_session.cpp\ + GeneratedFiles/Debug/moc_animation.cpp\ + GeneratedFiles/Debug/moc_toast_manager.cpp\ + GeneratedFiles/Debug/moc_button.cpp\ + GeneratedFiles/Debug/moc_popupmenu.cpp\ + GeneratedFiles/Debug/moc_countryinput.cpp\ + GeneratedFiles/Debug/moc_flatbutton.cpp\ + GeneratedFiles/Debug/moc_flatcheckbox.cpp\ + GeneratedFiles/Debug/moc_flatinput.cpp\ + GeneratedFiles/Debug/moc_flatlabel.cpp\ + GeneratedFiles/Debug/moc_flattextarea.cpp\ + GeneratedFiles/Debug/moc_scrollarea.cpp\ + GeneratedFiles/Debug/moc_twidget.cpp\ + GeneratedFiles/Debug/moc_aboutbox.cpp\ + GeneratedFiles/Debug/moc_abstractbox.cpp\ + GeneratedFiles/Debug/moc_addcontactbox.cpp\ + GeneratedFiles/Debug/moc_autolockbox.cpp\ + GeneratedFiles/Debug/moc_backgroundbox.cpp\ + GeneratedFiles/Debug/moc_confirmbox.cpp\ + GeneratedFiles/Debug/moc_connectionbox.cpp\ + GeneratedFiles/Debug/moc_contactsbox.cpp\ + GeneratedFiles/Debug/moc_downloadpathbox.cpp\ + GeneratedFiles/Debug/moc_emojibox.cpp\ + GeneratedFiles/Debug/moc_languagebox.cpp\ + GeneratedFiles/Debug/moc_passcodebox.cpp\ + GeneratedFiles/Debug/moc_photocropbox.cpp\ + GeneratedFiles/Debug/moc_photosendbox.cpp\ + GeneratedFiles/Debug/moc_sessionsbox.cpp\ + GeneratedFiles/Debug/moc_stickersetbox.cpp\ + GeneratedFiles/Debug/moc_usernamebox.cpp\ + GeneratedFiles/Debug/moc_introwidget.cpp\ + GeneratedFiles/Debug/moc_introcode.cpp\ + GeneratedFiles/Debug/moc_introphone.cpp\ + GeneratedFiles/Debug/moc_intropwdcheck.cpp\ + GeneratedFiles/Debug/moc_introsignup.cpp\ + GeneratedFiles/Debug/moc_pspecific_mac.cpp GeneratedFiles/Debug/moc_apiwrap.cpp: SourceFiles/basic_types.h \ SourceFiles/logs.h \ SourceFiles/apiwrap.h @@ -396,6 +572,10 @@ GeneratedFiles/Debug/moc_animation.cpp: SourceFiles/basic_types.h \ SourceFiles/ui/animation.h /usr/local/Qt-5.5.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.5.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.5.1/include/QtGui/5.5.1/QtGui -I/usr/local/Qt-5.5.1/include/QtCore/5.5.1/QtCore -I/usr/local/Qt-5.5.1/include -I./SourceFiles -I./GeneratedFiles -I../../Libraries/lzma/C -I../../Libraries/libexif-0.6.20 -I/usr/local/Qt-5.5.1/include -I/usr/local/Qt-5.5.1/include/QtMultimedia -I/usr/local/Qt-5.5.1/include/QtWidgets -I/usr/local/Qt-5.5.1/include/QtNetwork -I/usr/local/Qt-5.5.1/include/QtGui -I/usr/local/Qt-5.5.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/ui/animation.h -o GeneratedFiles/Debug/moc_animation.cpp +GeneratedFiles/Debug/moc_toast_manager.cpp: SourceFiles/ui/toast/toast.h \ + SourceFiles/ui/toast_manager.h + /usr/local/Qt-5.5.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.5.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.5.1/include/QtGui/5.5.1/QtGui -I/usr/local/Qt-5.5.1/include/QtCore/5.5.1/QtCore -I/usr/local/Qt-5.5.1/include -I./SourceFiles -I./GeneratedFiles -I../../Libraries/lzma/C -I../../Libraries/libexif-0.6.20 -I/usr/local/Qt-5.5.1/include -I/usr/local/Qt-5.5.1/include/QtMultimedia -I/usr/local/Qt-5.5.1/include/QtWidgets -I/usr/local/Qt-5.5.1/include/QtNetwork -I/usr/local/Qt-5.5.1/include/QtGui -I/usr/local/Qt-5.5.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/ui/toast/toast_manager.h -o GeneratedFiles/Debug/moc_toast_manager.cpp + GeneratedFiles/Debug/moc_button.cpp: ../../Libraries/QtStatic/qtbase/include/QtWidgets/QWidget \ SourceFiles/ui/twidget.h \ SourceFiles/ui/button.h