[Improvement] Show working dir in tray icon description

This commit is contained in:
Eric Kotato 2022-09-11 05:15:46 +03:00 committed by Eric Kotato
parent 3b0a541bc8
commit c2662ff1e4
3 changed files with 11 additions and 3 deletions

View file

@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_window.h" #include "styles/style_window.h"
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QDir>
#include <QtWidgets/QMenu> #include <QtWidgets/QMenu>
#include <QtWidgets/QSystemTrayIcon> #include <QtWidgets/QSystemTrayIcon>
@ -341,11 +342,13 @@ void Tray::createIcon() {
}); });
}; };
static const auto workdir = QDir::toNativeSeparators(QDir::cleanPath(cWorkingDir()));
_icon = base::make_unique_q<QSystemTrayIcon>(Parent()); _icon = base::make_unique_q<QSystemTrayIcon>(Parent());
_icon->setIcon(_iconGraphic->trayIcon( _icon->setIcon(_iconGraphic->trayIcon(
Core::App().unreadBadge(), Core::App().unreadBadge(),
Core::App().unreadBadgeMuted())); Core::App().unreadBadgeMuted()));
_icon->setToolTip(AppName.utf16()); _icon->setToolTip(AppName.utf16()+"\n"+workdir);
using Reason = QSystemTrayIcon::ActivationReason; using Reason = QSystemTrayIcon::ActivationReason;
base::qt_signal_producer( base::qt_signal_producer(

View file

@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "styles/style_window.h" #include "styles/style_window.h"
#include <QtCore/QDir>
#include <QtWidgets/QMenu> #include <QtWidgets/QMenu>
#import <AppKit/NSMenu.h> #import <AppKit/NSMenu.h>
@ -318,9 +319,11 @@ NativeIcon::NativeIcon()
[buttonCallback release]; [buttonCallback release];
}); });
static const auto workdir = QDir::toNativeSeparators(QDir::cleanPath(cWorkingDir()));
_status.button.target = buttonCallback; _status.button.target = buttonCallback;
_status.button.action = @selector(invoke); _status.button.action = @selector(invoke);
_status.button.toolTip = Q2NSString(AppName.utf16()); _status.button.toolTip = Q2NSString(AppName.utf16()+"\n"+workdir);
} }
NativeIcon::~NativeIcon() { NativeIcon::~NativeIcon() {

View file

@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "styles/style_window.h" #include "styles/style_window.h"
#include <QtCore/QDir>
#include <QtWidgets/QSystemTrayIcon> #include <QtWidgets/QSystemTrayIcon>
namespace Platform { namespace Platform {
@ -114,7 +115,8 @@ void Tray::createIcon() {
if (!_icon) { if (!_icon) {
_icon = base::make_unique_q<QSystemTrayIcon>(Parent()); _icon = base::make_unique_q<QSystemTrayIcon>(Parent());
updateIcon(); updateIcon();
_icon->setToolTip(AppName.utf16()); static const auto workdir = QDir::toNativeSeparators(QDir::cleanPath(cWorkingDir()));
_icon->setToolTip(AppName.utf16()+"\n"+workdir);
using Reason = QSystemTrayIcon::ActivationReason; using Reason = QSystemTrayIcon::ActivationReason;
base::qt_signal_producer( base::qt_signal_producer(
_icon.get(), _icon.get(),