From 4369c2331476a26d1330da6567cab1097db4e824 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 7 Oct 2016 16:24:19 +0300 Subject: [PATCH] Version 0.10.12.alpha: major notifications update. --- Telegram/Resources/langs/lang.strings | 1 + Telegram/Resources/winrc/Telegram.rc | 8 ++--- Telegram/Resources/winrc/Updater.rc | 8 ++--- Telegram/SourceFiles/application.cpp | 4 +-- .../SourceFiles/boxes/notifications_box.cpp | 15 +++++++++- Telegram/SourceFiles/core/version.h | 6 ++-- .../window/notifications_manager_default.cpp | 30 ++++++++++++------- .../window/notifications_manager_default.h | 2 ++ Telegram/build/version | 8 ++--- 9 files changed, 54 insertions(+), 28 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 38dfc2508..b4815a859 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -254,6 +254,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_notification_preview" = "You have a new message"; "lng_notification_reply" = "Reply"; "lng_notification_hide_all" = "Hide all"; +"lng_notification_sample" = "This is a sample notification"; "lng_settings_section_general" = "General"; "lng_settings_change_lang" = "Change language"; diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 1b2a0fdd7..7b071f53a 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,11,0 - PRODUCTVERSION 0,10,11,0 + FILEVERSION 0,10,12,0 + PRODUCTVERSION 0,10,12,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.10.11.0" + VALUE "FileVersion", "0.10.12.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.10.11.0" + VALUE "ProductVersion", "0.10.12.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index def0bd48c..89d66d002 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,11,0 - PRODUCTVERSION 0,10,11,0 + FILEVERSION 0,10,12,0 + PRODUCTVERSION 0,10,12,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.10.11.0" + VALUE "FileVersion", "0.10.12.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.10.11.0" + VALUE "ProductVersion", "0.10.12.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index b3f648c80..d8616fe18 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -1085,8 +1085,8 @@ void AppClass::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 10003) { - versionFeatures = QString::fromUtf8("\xe2\x80\x94 New cute design for the Settings page"); + if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 10012) { + versionFeatures = QString::fromUtf8("Windows and Linux:\n\xe2\x80\x94 Quick reply from notifications\n\xe2\x80\x94 Hide all notifications button added\n\xe2\x80\x94 Change notifications location and maximum count\n\nLinux:\n\xe2\x80\x94 You can enable native notifications in Settings"); } else if (!(cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 10005) { versionFeatures = langNewVersionText(); } else { diff --git a/Telegram/SourceFiles/boxes/notifications_box.cpp b/Telegram/SourceFiles/boxes/notifications_box.cpp index 90d32bc04..70c05eec1 100644 --- a/Telegram/SourceFiles/boxes/notifications_box.cpp +++ b/Telegram/SourceFiles/boxes/notifications_box.cpp @@ -84,14 +84,27 @@ private: _owner->removeSample(this); } hide(); - deleteLater(); + destroyDelayed(); } } + void destroyDelayed() { + if (_deleted) return; + _deleted = true; + + // Ubuntu has a lag if deleteLater() called immediately. +#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 + QTimer::singleShot(1000, [this] { delete this; }); +#else // Q_OS_LINUX32 || Q_OS_LINUX64 + deleteLater(); +#endif // Q_OS_LINUX32 || Q_OS_LINUX64 + } + NotificationsBox *_owner; QPixmap _cache; FloatAnimation _opacity; bool _hiding = false; + bool _deleted = false; }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 5c49b9b9d..e3ef0cebd 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 10011; -constexpr str_const AppVersionStr = "0.10.11"; -constexpr bool AppAlphaVersion = false; +constexpr int AppVersion = 10012; +constexpr str_const AppVersionStr = "0.10.12"; +constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp index f0b26ea49..5932eefbb 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.cpp +++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp @@ -296,9 +296,12 @@ void Manager::doClearAllFast() { _queuedNotifications.clear(); auto notifications = createAndSwap(_notifications); for_const (auto notification, notifications) { - notification->deleteLater(); + delete notification; + } + if (_hideAll) { + auto hideAll = createAndSwap(_hideAll); + delete hideAll; } - showNextFromQueue(); } void Manager::doClearFromHistory(History *history) { @@ -347,21 +350,33 @@ Widget::Widget(QPoint startPosition, int shift, Direction shiftDirection) : TWid , _a_shift(animation(this, &Widget::step_shift)) { setWindowOpacity(0.); - setAttribute(Qt::WA_OpaquePaintEvent); - setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::BypassWindowManagerHint | Qt::NoDropShadowWindowHint); + setAttribute(Qt::WA_OpaquePaintEvent); setAttribute(Qt::WA_MacAlwaysShowToolWindow); _a_opacity.start(); } +void Widget::destroyDelayed() { + hide(); + if (_deleted) return; + _deleted = true; + + // Ubuntu has a lag if deleteLater() called immediately. +#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 + QTimer::singleShot(1000, [this] { delete this; }); +#else // Q_OS_LINUX32 || Q_OS_LINUX64 + deleteLater(); +#endif // Q_OS_LINUX32 || Q_OS_LINUX64 +} + void Widget::step_opacity(float64 ms, bool timer) { float64 dt = ms / float64(_opacityDuration); if (dt >= 1) { a_opacity.finish(); _a_opacity.stop(); if (_hiding) { - deleteLater(); + destroyDelayed(); } } else { a_opacity.update(dt, a_func); @@ -500,11 +515,6 @@ Notification::Notification(History *history, PeerData *peer, PeerData *author, H prepareActionsCache(); - setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::BypassWindowManagerHint | Qt::NoDropShadowWindowHint); - setAttribute(Qt::WA_MacAlwaysShowToolWindow); - setAttribute(Qt::WA_NoSystemBackground, true); - setAttribute(Qt::WA_TranslucentBackground, true); - show(); } diff --git a/Telegram/SourceFiles/window/notifications_manager_default.h b/Telegram/SourceFiles/window/notifications_manager_default.h index e4dbfb83e..1a2dbd069 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.h +++ b/Telegram/SourceFiles/window/notifications_manager_default.h @@ -148,12 +148,14 @@ protected: virtual void updateGeometry(int x, int y, int width, int height); private: + void destroyDelayed(); void moveByShift(); void hideAnimated(float64 duration, anim::transition func); void step_opacity(float64 ms, bool timer); void step_shift(float64 ms, bool timer); bool _hiding = false; + bool _deleted = false; float64 _opacityDuration; anim::fvalue a_opacity; anim::transition a_func; diff --git a/Telegram/build/version b/Telegram/build/version index 6eec02a3c..98c0ccfbe 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 10011 +AppVersion 10012 AppVersionStrMajor 0.10 -AppVersionStrSmall 0.10.11 -AppVersionStr 0.10.11 -AlphaChannel 0 +AppVersionStrSmall 0.10.12 +AppVersionStr 0.10.12 +AlphaChannel 1 BetaVersion 0