From c2662ff1e48fb736c02a9949ef534d95379d9c86 Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Sun, 11 Sep 2022 05:15:46 +0300 Subject: [PATCH] [Improvement] Show working dir in tray icon description --- Telegram/SourceFiles/platform/linux/tray_linux.cpp | 5 ++++- Telegram/SourceFiles/platform/mac/tray_mac.mm | 5 ++++- Telegram/SourceFiles/platform/win/tray_win.cpp | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp index b888ed33a..0c4532fd2 100644 --- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp @@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_window.h" #include +#include #include #include @@ -341,11 +342,13 @@ void Tray::createIcon() { }); }; + static const auto workdir = QDir::toNativeSeparators(QDir::cleanPath(cWorkingDir())); + _icon = base::make_unique_q(Parent()); _icon->setIcon(_iconGraphic->trayIcon( Core::App().unreadBadge(), Core::App().unreadBadgeMuted())); - _icon->setToolTip(AppName.utf16()); + _icon->setToolTip(AppName.utf16()+"\n"+workdir); using Reason = QSystemTrayIcon::ActivationReason; base::qt_signal_producer( diff --git a/Telegram/SourceFiles/platform/mac/tray_mac.mm b/Telegram/SourceFiles/platform/mac/tray_mac.mm index f70a9d399..15ecc89a4 100644 --- a/Telegram/SourceFiles/platform/mac/tray_mac.mm +++ b/Telegram/SourceFiles/platform/mac/tray_mac.mm @@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_session_controller.h" #include "styles/style_window.h" +#include #include #import @@ -318,9 +319,11 @@ NativeIcon::NativeIcon() [buttonCallback release]; }); + static const auto workdir = QDir::toNativeSeparators(QDir::cleanPath(cWorkingDir())); + _status.button.target = buttonCallback; _status.button.action = @selector(invoke); - _status.button.toolTip = Q2NSString(AppName.utf16()); + _status.button.toolTip = Q2NSString(AppName.utf16()+"\n"+workdir); } NativeIcon::~NativeIcon() { diff --git a/Telegram/SourceFiles/platform/win/tray_win.cpp b/Telegram/SourceFiles/platform/win/tray_win.cpp index b54203bcb..b2f6a8831 100644 --- a/Telegram/SourceFiles/platform/win/tray_win.cpp +++ b/Telegram/SourceFiles/platform/win/tray_win.cpp @@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_session_controller.h" #include "styles/style_window.h" +#include #include namespace Platform { @@ -114,7 +115,8 @@ void Tray::createIcon() { if (!_icon) { _icon = base::make_unique_q(Parent()); updateIcon(); - _icon->setToolTip(AppName.utf16()); + static const auto workdir = QDir::toNativeSeparators(QDir::cleanPath(cWorkingDir())); + _icon->setToolTip(AppName.utf16()+"\n"+workdir); using Reason = QSystemTrayIcon::ActivationReason; base::qt_signal_producer( _icon.get(),