diff --git a/Telegram/Resources/default_kotato-settings-custom.json b/Telegram/Resources/default_kotato-settings-custom.json index 0fc95c3d0..cbbb06b3c 100644 --- a/Telegram/Resources/default_kotato-settings-custom.json +++ b/Telegram/Resources/default_kotato-settings-custom.json @@ -16,6 +16,5 @@ // "show_phone_in_drawer": true, // "scales": [], // "confirm_before_calls": false, - // "no_taskbar_flash": false, // "recent_stickers_limit": 20 } diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 62c9823f4..e36f3db05 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -2432,7 +2432,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ktg_net_speed_boost_big" = "Big"; "ktg_settings_system" = "System"; -"ktg_settings_no_taskbar_flash" = "Disable taskbar flashing"; "ktg_settings_other" = "Other"; "ktg_profile_copy_id" = "Copy ID"; diff --git a/Telegram/Resources/langs/rewrites/ru.json b/Telegram/Resources/langs/rewrites/ru.json index f0c78e924..7235cd573 100644 --- a/Telegram/Resources/langs/rewrites/ru.json +++ b/Telegram/Resources/langs/rewrites/ru.json @@ -66,7 +66,6 @@ "ktg_net_speed_boost_medium": "Среднее", "ktg_net_speed_boost_big": "Высокое", "ktg_settings_system": "Система", - "ktg_settings_no_taskbar_flash": "Отключить мигание на панели задач", "ktg_settings_other": "Прочие", "ktg_profile_copy_id": "Копировать ID", "ktg_profile_bot_id": "ID бота", diff --git a/Telegram/SourceFiles/kotato/json_settings.cpp b/Telegram/SourceFiles/kotato/json_settings.cpp index 15734174a..aa04e2ec2 100644 --- a/Telegram/SourceFiles/kotato/json_settings.cpp +++ b/Telegram/SourceFiles/kotato/json_settings.cpp @@ -185,7 +185,6 @@ QByteArray GenerateSettingsJson(bool areDefault = false) { settings.insert(qsl("chat_list_lines"), DialogListLines()); settings.insert(qsl("disable_up_edit"), cDisableUpEdit()); settings.insert(qsl("confirm_before_calls"), cConfirmBeforeCall()); - settings.insert(qsl("no_taskbar_flash"), cNoTaskbarFlashing()); settings.insert(qsl("recent_stickers_limit"), RecentStickersLimit()); settings.insert(qsl("userpic_corner_type"), cUserpicCornersType()); settings.insert(qsl("always_show_top_userpic"), cShowTopBarUserpic()); @@ -400,10 +399,6 @@ bool Manager::readCustomFile() { cSetConfirmBeforeCall(v); }); - ReadBoolOption(settings, "no_taskbar_flash", [&](auto v) { - cSetNoTaskbarFlashing(v); - }); - ReadIntOption(settings, "recent_stickers_limit", [&](auto v) { if (v >= 0 && v <= 200) { SetRecentStickersLimit(v); diff --git a/Telegram/SourceFiles/kotato/settings.cpp b/Telegram/SourceFiles/kotato/settings.cpp index 7492240f7..ec9e8dc22 100644 --- a/Telegram/SourceFiles/kotato/settings.cpp +++ b/Telegram/SourceFiles/kotato/settings.cpp @@ -112,7 +112,6 @@ bool AddCustomReplace(QString from, QString to) { } bool gConfirmBeforeCall = false; -bool gNoTaskbarFlashing = false; rpl::variable gRecentStickersLimit = 20; void SetRecentStickersLimit(int limit) { diff --git a/Telegram/SourceFiles/kotato/settings.h b/Telegram/SourceFiles/kotato/settings.h index c76b8347b..f3cf56cf4 100644 --- a/Telegram/SourceFiles/kotato/settings.h +++ b/Telegram/SourceFiles/kotato/settings.h @@ -87,7 +87,6 @@ using CustomReplacementsMap = QMap; DeclareRefSetting(CustomReplacementsMap, CustomReplaces); bool AddCustomReplace(QString from, QString to); DeclareSetting(bool, ConfirmBeforeCall); -DeclareSetting(bool, NoTaskbarFlashing); void SetRecentStickersLimit(int limit); [[nodiscard]] int RecentStickersLimit(); diff --git a/Telegram/SourceFiles/kotato/settings_menu.cpp b/Telegram/SourceFiles/kotato/settings_menu.cpp index 622252577..8995d0f48 100644 --- a/Telegram/SourceFiles/kotato/settings_menu.cpp +++ b/Telegram/SourceFiles/kotato/settings_menu.cpp @@ -369,8 +369,6 @@ void SetupKotatoSystem(not_null container) { AddSkip(container); AddSubsectionTitle(container, tr::ktg_settings_system()); - SettingsMenuCSwitch(ktg_settings_no_taskbar_flash, NoTaskbarFlashing); - const QMap trayIconOptions = { { 0, TrayIconLabel(0) }, { 1, TrayIconLabel(1) }, diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp index bf062cc7d..52635d210 100644 --- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp @@ -6,7 +6,6 @@ For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "platform/linux/notifications_manager_linux.h" -#include "mainwindow.h" #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #include "platform/linux/specific_linux.h" @@ -20,20 +19,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION -#include namespace Platform { namespace Notifications { -void FlashBounce() { - auto window = App::wnd(); - if (!window) { - return; - } - - QApplication::alert(window); -} - #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION namespace { diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h index 1005c0403..ba6bcc88f 100644 --- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h +++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h @@ -19,6 +19,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Platform { namespace Notifications { +inline void FlashBounce() { +} + #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION class NotificationData : public QObject { Q_OBJECT diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp index 43ad00574..f5f5dc366 100644 --- a/Telegram/SourceFiles/window/notifications_manager.cpp +++ b/Telegram/SourceFiles/window/notifications_manager.cpp @@ -290,9 +290,7 @@ void System::showNext() { } } if (alert) { - if (!cNoTaskbarFlashing()) { - Platform::Notifications::FlashBounce(); - } + Platform::Notifications::FlashBounce(); if (Global::SoundNotify() && !Platform::Notifications::SkipAudio()) { ensureSoundCreated(); _soundTrack->playOnce();