From f2d2826fc7f6216e61616f8e82498578a3d08c4c Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 19 Sep 2022 06:59:50 +0400 Subject: [PATCH] Make InstallLauncher accessible on any platform --- Telegram/SourceFiles/platform/linux/specific_linux.h | 2 -- Telegram/SourceFiles/platform/mac/specific_mac.h | 3 +++ Telegram/SourceFiles/platform/platform_specific.h | 1 + Telegram/SourceFiles/platform/win/specific_win.h | 3 +++ Telegram/SourceFiles/settings/settings_codes.cpp | 11 ++++------- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h index 492552b59..002bd0234 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.h +++ b/Telegram/SourceFiles/platform/linux/specific_linux.h @@ -15,8 +15,6 @@ class LocationPoint; namespace Platform { -void InstallLauncher(bool force = false); - inline void IgnoreApplicationActivationRightNow() { } diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h index 4671e7696..e3a9fc2e1 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac.h +++ b/Telegram/SourceFiles/platform/mac/specific_mac.h @@ -33,6 +33,9 @@ inline bool SkipTaskbarSupported() { return false; } +inline void InstallLauncher(bool force) { +} + namespace ThirdParty { inline void start() { diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h index e36f64e38..dc863b179 100644 --- a/Telegram/SourceFiles/platform/platform_specific.h +++ b/Telegram/SourceFiles/platform/platform_specific.h @@ -42,6 +42,7 @@ bool TrayIconSupported(); bool SkipTaskbarSupported(); void WriteCrashDumpDetails(); void NewVersionLaunched(int oldVersion); +void InstallLauncher(bool force = false); [[nodiscard]] std::optional IsDarkMode(); [[nodiscard]] inline bool IsDarkModeSupported() { diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h index 7f2ff8afc..b8fccad89 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.h +++ b/Telegram/SourceFiles/platform/win/specific_win.h @@ -27,6 +27,9 @@ inline bool SkipTaskbarSupported() { return true; } +inline void InstallLauncher(bool force) { +} + namespace ThirdParty { void start(); diff --git a/Telegram/SourceFiles/settings/settings_codes.cpp b/Telegram/SourceFiles/settings/settings_codes.cpp index 3786cfeb6..409ff780f 100644 --- a/Telegram/SourceFiles/settings/settings_codes.cpp +++ b/Telegram/SourceFiles/settings/settings_codes.cpp @@ -179,6 +179,10 @@ auto GenerateCodes() { Core::Application::RegisterUrlScheme(); Ui::Toast::Show("Forced custom scheme register."); }); + codes.emplace(qsl("installlauncher"), [](SessionController *window) { + Platform::InstallLauncher(true); + Ui::Toast::Show("Forced launcher installation."); + }); #if defined Q_OS_WIN || defined Q_OS_MAC codes.emplace(qsl("freetype"), [](SessionController *window) { @@ -196,13 +200,6 @@ auto GenerateCodes() { }); #endif // Q_OS_WIN || Q_OS_MAC -#if defined Q_OS_UNIX && !defined Q_OS_MAC - codes.emplace(qsl("installlauncher"), [](SessionController *window) { - Platform::InstallLauncher(true); - Ui::Toast::Show("Forced launcher installation."); - }); -#endif // Q_OS_UNIX && !Q_OS_MAC - auto audioFilters = qsl("Audio files (*.wav *.mp3);;") + FileDialog::AllFilesFilter(); auto audioKeys = { qsl("msg_incoming"),