diff --git a/Telegram/Resources/art/favicon.ico b/Telegram/Resources/art/favicon.ico index 11474318b..5c23320d6 100644 Binary files a/Telegram/Resources/art/favicon.ico and b/Telegram/Resources/art/favicon.ico differ diff --git a/Telegram/Resources/art/icon128.png b/Telegram/Resources/art/icon128.png index bc337cb5a..0a2c3b969 100644 Binary files a/Telegram/Resources/art/icon128.png and b/Telegram/Resources/art/icon128.png differ diff --git a/Telegram/Resources/art/icon128@2x.png b/Telegram/Resources/art/icon128@2x.png index 8ca330aeb..4a7bbb4e4 100644 Binary files a/Telegram/Resources/art/icon128@2x.png and b/Telegram/Resources/art/icon128@2x.png differ diff --git a/Telegram/Resources/art/icon16.png b/Telegram/Resources/art/icon16.png index d8c95f007..a3553a4bc 100644 Binary files a/Telegram/Resources/art/icon16.png and b/Telegram/Resources/art/icon16.png differ diff --git a/Telegram/Resources/art/icon16@2x.png b/Telegram/Resources/art/icon16@2x.png index 7281f6412..32b6a5686 100644 Binary files a/Telegram/Resources/art/icon16@2x.png and b/Telegram/Resources/art/icon16@2x.png differ diff --git a/Telegram/Resources/art/icon256.ico b/Telegram/Resources/art/icon256.ico index 51e896e63..3a53b3b51 100644 Binary files a/Telegram/Resources/art/icon256.ico and b/Telegram/Resources/art/icon256.ico differ diff --git a/Telegram/Resources/art/icon256.png b/Telegram/Resources/art/icon256.png index 88b743257..2e818f129 100644 Binary files a/Telegram/Resources/art/icon256.png and b/Telegram/Resources/art/icon256.png differ diff --git a/Telegram/Resources/art/icon256@2x.png b/Telegram/Resources/art/icon256@2x.png index 59b2dce23..dc2da2b33 100644 Binary files a/Telegram/Resources/art/icon256@2x.png and b/Telegram/Resources/art/icon256@2x.png differ diff --git a/Telegram/Resources/art/icon32.png b/Telegram/Resources/art/icon32.png index c40bb6b9d..231c1e335 100644 Binary files a/Telegram/Resources/art/icon32.png and b/Telegram/Resources/art/icon32.png differ diff --git a/Telegram/Resources/art/icon32@2x.png b/Telegram/Resources/art/icon32@2x.png index 0f5e77715..c4e635afe 100644 Binary files a/Telegram/Resources/art/icon32@2x.png and b/Telegram/Resources/art/icon32@2x.png differ diff --git a/Telegram/Resources/art/icon48.png b/Telegram/Resources/art/icon48.png index 360347222..ff2b2c759 100644 Binary files a/Telegram/Resources/art/icon48.png and b/Telegram/Resources/art/icon48.png differ diff --git a/Telegram/Resources/art/icon48@2x.png b/Telegram/Resources/art/icon48@2x.png index 06591cca7..c2d9bb58c 100644 Binary files a/Telegram/Resources/art/icon48@2x.png and b/Telegram/Resources/art/icon48@2x.png differ diff --git a/Telegram/Resources/art/icon512.png b/Telegram/Resources/art/icon512.png index daa293ba2..7dc492002 100644 Binary files a/Telegram/Resources/art/icon512.png and b/Telegram/Resources/art/icon512.png differ diff --git a/Telegram/Resources/art/icon512@2x.png b/Telegram/Resources/art/icon512@2x.png index 28455ade1..59ed2b9ab 100644 Binary files a/Telegram/Resources/art/icon512@2x.png and b/Telegram/Resources/art/icon512@2x.png differ diff --git a/Telegram/Resources/art/icon64.png b/Telegram/Resources/art/icon64.png index 6e2f53592..b4111e8db 100644 Binary files a/Telegram/Resources/art/icon64.png and b/Telegram/Resources/art/icon64.png differ diff --git a/Telegram/Resources/art/icon64@2x.png b/Telegram/Resources/art/icon64@2x.png index cd41f0a35..0a2c3b969 100644 Binary files a/Telegram/Resources/art/icon64@2x.png and b/Telegram/Resources/art/icon64@2x.png differ diff --git a/Telegram/Resources/art/icon_green.png b/Telegram/Resources/art/icon_green.png index 9b214e0df..d84881e26 100644 Binary files a/Telegram/Resources/art/icon_green.png and b/Telegram/Resources/art/icon_green.png differ diff --git a/Telegram/Resources/art/iconbig256.png b/Telegram/Resources/art/iconbig256.png index 1f1313834..1a94181b9 100644 Binary files a/Telegram/Resources/art/iconbig256.png and b/Telegram/Resources/art/iconbig256.png differ diff --git a/Telegram/Resources/art/iconbig_green.png b/Telegram/Resources/art/iconbig_green.png index a14b88e32..382a9c962 100644 Binary files a/Telegram/Resources/art/iconbig_green.png and b/Telegram/Resources/art/iconbig_green.png differ diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp index 4678340d6..486d731ca 100644 --- a/Telegram/SourceFiles/boxes/contactsbox.cpp +++ b/Telegram/SourceFiles/boxes/contactsbox.cpp @@ -55,8 +55,8 @@ ContactsBox::ContactsBox(QWidget*, ChatData *chat, MembersFilter filter) } ContactsBox::ContactsBox(QWidget*, ChannelData *channel) -: _creating(CreatingGroupChannel) -, _channel(channel) +: _channel(channel) +, _creating(CreatingGroupChannel) , _select(createMultiSelect()) , _searchTimer(this) { } diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/history/history.style index 95afbccd4..15fce02f1 100644 --- a/Telegram/SourceFiles/history/history.style +++ b/Telegram/SourceFiles/history/history.style @@ -71,16 +71,18 @@ membersInnerWidth: 310px; membersInnerHeightMax: 360px; membersInnerDropdown: InnerDropdown(defaultInnerDropdown) { scroll: ScrollArea(defaultSolidScroll) { - deltat: 3px; - deltab: 3px; + deltat: 0px; + deltab: 0px; round: 1px; width: 8px; deltax: 3px; } scrollMargin: margins(0px, 5px, 0px, 5px); - scrollPadding: margins(0px, 3px, 8px, 3px); + scrollPadding: margins(0px, 3px, 0px, 3px); } membersInnerItem: ProfilePeerListItem { + left: 0px; + bottom: 0px; button: OutlineButton { outlineWidth: 0px; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 7adf14f99..e2033aa7f 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -6398,14 +6398,14 @@ void HistoryWidget::clearInlineBot() { void HistoryWidget::inlineBotChanged() { bool isInlineBot = _inlineBot && (_inlineBot != Ui::LookingUpInlineBot); if (isInlineBot && !_inlineBotCancel) { - _inlineBotCancel = std_::make_unique(this, st::historyInlineBotCancel); - connect(_inlineBotCancel.get(), SIGNAL(clicked()), this, SLOT(onInlineBotCancel())); + _inlineBotCancel.create(this, st::historyInlineBotCancel); + connect(_inlineBotCancel, SIGNAL(clicked()), this, SLOT(onInlineBotCancel())); _inlineBotCancel->setGeometry(_send->geometry()); _attachEmoji->raise(); updateFieldSubmitSettings(); updateControlsVisibility(); } else if (!isInlineBot && _inlineBotCancel) { - _inlineBotCancel = nullptr; + _inlineBotCancel.destroy(); updateFieldSubmitSettings(); updateControlsVisibility(); } @@ -8911,3 +8911,5 @@ bool HistoryWidget::touchScroll(const QPoint &delta) { _scroll->scrollToY(scNew); return true; } + +HistoryWidget::~HistoryWidget() = default; diff --git a/Telegram/SourceFiles/historywidget.h b/Telegram/SourceFiles/historywidget.h index 33fadbbfb..c7854da4a 100644 --- a/Telegram/SourceFiles/historywidget.h +++ b/Telegram/SourceFiles/historywidget.h @@ -721,6 +721,8 @@ public: bool cmd_next_chat(); bool cmd_previous_chat(); + ~HistoryWidget(); + protected: void resizeEvent(QResizeEvent *e) override; void keyPressEvent(QKeyEvent *e) override; @@ -1089,7 +1091,7 @@ private: UserData *_inlineBot = nullptr; QString _inlineBotUsername; mtpRequestId _inlineBotResolveRequestId = 0; - std_::unique_ptr _inlineBotCancel; + object_ptr _inlineBotCancel = { nullptr }; void inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result); bool inlineBotResolveFail(QString name, const RPCError &error); diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.cpp b/Telegram/SourceFiles/platform/win/windows_dlls.cpp index 84d0f56bb..d1c43bada 100644 --- a/Telegram/SourceFiles/platform/win/windows_dlls.cpp +++ b/Telegram/SourceFiles/platform/win/windows_dlls.cpp @@ -49,6 +49,7 @@ f_SHCreateItemFromParsingName SHCreateItemFromParsingName; f_WTSRegisterSessionNotification WTSRegisterSessionNotification; f_WTSUnRegisterSessionNotification WTSUnRegisterSessionNotification; f_SHQueryUserNotificationState SHQueryUserNotificationState; +f_SHChangeNotify SHChangeNotify; f_SetCurrentProcessExplicitAppUserModelID SetCurrentProcessExplicitAppUserModelID; f_RoGetActivationFactory RoGetActivationFactory; f_WindowsCreateStringReference WindowsCreateStringReference; @@ -70,8 +71,13 @@ void start() { load(LibShell32, "SHOpenWithDialog", SHOpenWithDialog); load(LibShell32, "OpenAs_RunDLLW", OpenAs_RunDLL); load(LibShell32, "SHQueryUserNotificationState", SHQueryUserNotificationState); + load(LibShell32, "SHChangeNotify", SHChangeNotify); load(LibShell32, "SetCurrentProcessExplicitAppUserModelID", SetCurrentProcessExplicitAppUserModelID); + if (cBetaVersion() == 10020001 && SHChangeNotify) { // Temp - app icon was changed + SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr); + } + LibUxTheme = LoadLibrary(L"UXTHEME.DLL"); load(LibUxTheme, "SetWindowTheme", SetWindowTheme); diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.h b/Telegram/SourceFiles/platform/win/windows_dlls.h index 27a82d502..27e65de72 100644 --- a/Telegram/SourceFiles/platform/win/windows_dlls.h +++ b/Telegram/SourceFiles/platform/win/windows_dlls.h @@ -63,6 +63,9 @@ extern f_OpenAs_RunDLL OpenAs_RunDLL; typedef HRESULT (FAR STDAPICALLTYPE *f_SHQueryUserNotificationState)(QUERY_USER_NOTIFICATION_STATE *pquns); extern f_SHQueryUserNotificationState SHQueryUserNotificationState; +typedef void (FAR STDAPICALLTYPE *f_SHChangeNotify)(LONG wEventId, UINT uFlags, __in_opt LPCVOID dwItem1, __in_opt LPCVOID dwItem2); +extern f_SHChangeNotify SHChangeNotify; + typedef HRESULT (FAR STDAPICALLTYPE *f_SetCurrentProcessExplicitAppUserModelID)(__in PCWSTR AppID); extern f_SetCurrentProcessExplicitAppUserModelID SetCurrentProcessExplicitAppUserModelID; diff --git a/Telegram/SourceFiles/profile/profile.style b/Telegram/SourceFiles/profile/profile.style index c2cfa9709..6128a6cde 100644 --- a/Telegram/SourceFiles/profile/profile.style +++ b/Telegram/SourceFiles/profile/profile.style @@ -117,6 +117,8 @@ profileInviteLinkText: FlatLabel(profileBlockTextPart) { profileLimitReachedSkip: 6px; profileMemberItem: ProfilePeerListItem { + left: 8px; + bottom: profileBlockMarginBottom; button: defaultLeftOutlineButton; statusFg: windowSubTextFg; statusFgOver: #7c99b2; diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp b/Telegram/SourceFiles/profile/profile_block_peer_list.cpp index a6173c5df..e9b5f4f5c 100644 --- a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp +++ b/Telegram/SourceFiles/profile/profile_block_peer_list.cpp @@ -46,7 +46,7 @@ int PeerListWidget::resizeGetHeight(int newWidth) { newHeight += _items.size() * st::profileMemberHeight; - return newHeight + st::profileBlockMarginBottom; + return newHeight + _st.bottom; } void PeerListWidget::setVisibleTopBottom(int visibleTop, int visibleBottom) { @@ -251,7 +251,7 @@ void PeerListWidget::repaintRow(int index) { } int PeerListWidget::getListLeft() const { - return st::profileBlockTitlePosition.x() - st::profileMemberPaddingLeft; + return _st.left; } int PeerListWidget::rowWidth() const { diff --git a/Telegram/SourceFiles/pspecific_win.cpp b/Telegram/SourceFiles/pspecific_win.cpp index 51f612772..deec74b75 100644 --- a/Telegram/SourceFiles/pspecific_win.cpp +++ b/Telegram/SourceFiles/pspecific_win.cpp @@ -828,6 +828,12 @@ void psNewVersion() { if (Local::oldSettingsVersion() < 8051) { AppUserModelId::checkPinned(); } + if (Local::oldSettingsVersion() > 0 && Local::oldSettingsVersion() < 10021) { + // Reset icons cache, because we've changed the application icon. + if (Dlls::SHChangeNotify) { + Dlls::SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr); + } + } } void psExecUpdater() { diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp index fd11eb43a..106e5b540 100644 --- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp +++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp @@ -218,7 +218,7 @@ void SettingsSlider::startRipple(int sectionIndex) { QImage SettingsSlider::prepareRippleMask(int sectionIndex, const Section §ion) { auto size = QSize(section.width, height() - _st.rippleBottomSkip); - if (!_st.rippleRoundRadius || sectionIndex > 0 && sectionIndex + 1 < getSectionsCount()) { + if (!_st.rippleRoundRadius || (sectionIndex > 0 && sectionIndex + 1 < getSectionsCount())) { return RippleAnimation::rectMask(size); } return RippleAnimation::maskByDrawer(size, false, [this, sectionIndex, width = section.width](QPainter &p) { diff --git a/Telegram/SourceFiles/ui/widgets/widgets.style b/Telegram/SourceFiles/ui/widgets/widgets.style index 3f1bc3b8a..d0fb9815e 100644 --- a/Telegram/SourceFiles/ui/widgets/widgets.style +++ b/Telegram/SourceFiles/ui/widgets/widgets.style @@ -868,6 +868,9 @@ MediaPlayerButton { } ProfilePeerListItem { + left: pixels; + bottom: pixels; + button: OutlineButton; statusFg: color; statusFgOver: color; diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/Contents.json b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/Contents.json index 15194319d..441d0c24c 100644 --- a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/Contents.json @@ -3,61 +3,61 @@ { "size" : "16x16", "idiom" : "mac", - "filename" : "icon_16x16.png", + "filename" : "icon16.png", "scale" : "1x" }, { "size" : "16x16", "idiom" : "mac", - "filename" : "icon_16x16@2x.png", + "filename" : "icon16@2x.png", "scale" : "2x" }, { "size" : "32x32", "idiom" : "mac", - "filename" : "icon_32x32.png", + "filename" : "icon32.png", "scale" : "1x" }, { "size" : "32x32", "idiom" : "mac", - "filename" : "icon_32x32@2x.png", + "filename" : "icon32@2x.png", "scale" : "2x" }, { "size" : "128x128", "idiom" : "mac", - "filename" : "icon_128x128.png", + "filename" : "icon128.png", "scale" : "1x" }, { "size" : "128x128", "idiom" : "mac", - "filename" : "icon_128x128@2x.png", + "filename" : "icon128@2x.png", "scale" : "2x" }, { "size" : "256x256", "idiom" : "mac", - "filename" : "icon_256x256.png", + "filename" : "icon256.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "256x256", - "filename" : "icon_256x256@2x.png", + "idiom" : "mac", + "filename" : "icon256@2x.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "512x512", - "filename" : "icon_512x512.png", + "idiom" : "mac", + "filename" : "icon512.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "512x512", - "filename" : "icon_512x512@2x.png", + "idiom" : "mac", + "filename" : "icon512@2x.png", "scale" : "2x" } ], diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128.png new file mode 100644 index 000000000..0a2c3b969 Binary files /dev/null and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128@2x.png new file mode 100644 index 000000000..4a7bbb4e4 Binary files /dev/null and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16.png new file mode 100644 index 000000000..a3553a4bc Binary files /dev/null and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16@2x.png similarity index 79% rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png rename to Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16@2x.png index 7281f6412..32b6a5686 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256.png new file mode 100644 index 000000000..2e818f129 Binary files /dev/null and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256@2x.png new file mode 100644 index 000000000..dc2da2b33 Binary files /dev/null and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32.png new file mode 100644 index 000000000..231c1e335 Binary files /dev/null and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32@2x.png similarity index 70% rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png rename to Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32@2x.png index 0f5e77715..c4e635afe 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512.png new file mode 100644 index 000000000..7dc492002 Binary files /dev/null and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512@2x.png new file mode 100644 index 000000000..59ed2b9ab Binary files /dev/null and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128.png deleted file mode 100644 index bc337cb5a..000000000 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128.png and /dev/null differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png deleted file mode 100644 index 8ca330aeb..000000000 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png and /dev/null differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16.png deleted file mode 100644 index d8c95f007..000000000 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16.png and /dev/null differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256.png deleted file mode 100644 index 88b743257..000000000 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256.png and /dev/null differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png deleted file mode 100644 index 59b2dce23..000000000 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png and /dev/null differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32.png deleted file mode 100644 index c40bb6b9d..000000000 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32.png and /dev/null differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512.png deleted file mode 100644 index daa293ba2..000000000 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512.png and /dev/null differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png deleted file mode 100644 index 28455ade1..000000000 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png and /dev/null differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png index bc337cb5a..0a2c3b969 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png index 8ca330aeb..4a7bbb4e4 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png index d8c95f007..a3553a4bc 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png index 7281f6412..32b6a5686 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png index 88b743257..2e818f129 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png index 59b2dce23..dc2da2b33 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png index c40bb6b9d..231c1e335 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png index 0f5e77715..c4e635afe 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png index daa293ba2..7dc492002 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png index 28455ade1..59ed2b9ab 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png differ diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat index 985157502..281781a7c 100644 --- a/Telegram/build/build.bat +++ b/Telegram/build/build.bat @@ -44,7 +44,7 @@ set "ReleasePath=%HomePath%\..\out\Release" set "DeployPath=%ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStrFull%" set "SignPath=%HomePath%\..\..\TelegramPrivate\Sign.bat" set "BinaryName=Telegram" -set "DropboxSymbolsPath=Y:\Telegram\symbols" +set "DropboxSymbolsPath=X:\Telegram\symbols" if not exist %DropboxSymbolsPath% ( echo Dropbox path not found! diff --git a/Telegram/gyp/refresh.sh b/Telegram/gyp/refresh.sh index 4bc35fb48..9ee05aefa 100755 --- a/Telegram/gyp/refresh.sh +++ b/Telegram/gyp/refresh.sh @@ -20,7 +20,7 @@ else #gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode-ninja #gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode # use patched gyp with Xcode project generator - ../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp -Gxcode_upgrade_check_project_version=810 --format=xcode + ../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp -Gxcode_upgrade_check_project_version=820 --format=xcode fi cd ../.. diff --git a/Telegram/gyp/telegram_mac.gypi b/Telegram/gyp/telegram_mac.gypi index a2f2e5a43..6544bd927 100644 --- a/Telegram/gyp/telegram_mac.gypi +++ b/Telegram/gyp/telegram_mac.gypi @@ -62,7 +62,7 @@ 'mac_bundle': '1', 'mac_bundle_resources': [ '