From 1e3ac691ebad823a6a95b2d73937c76e80fa5d12 Mon Sep 17 00:00:00 2001 From: Alexey Minnekhanov Date: Mon, 5 Feb 2018 14:11:07 +0300 Subject: [PATCH 1/2] Use custom application name in tray popup menu --- Telegram/Resources/langs/lang.strings | 4 ++-- Telegram/SourceFiles/mainwindow.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index c5e569340..1d8d03ef3 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -31,9 +31,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org "lng_disable_notifications_from_tray" = "Disable notifications"; "lng_enable_notifications_from_tray" = "Enable notifications"; -"lng_open_from_tray" = "Open Telegram"; +"lng_open_from_tray" = "Open "; "lng_minimize_to_tray" = "Minimize to tray"; -"lng_quit_from_tray" = "Quit Telegram"; +"lng_quit_from_tray" = "Quit "; "lng_tray_icon_text" = "Telegram is still running here,\nyou can change this from settings page.\nIf this icon disappears from tray menu,\nyou can drag it here from hidden icons."; "lng_month1" = "January"; diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index 9c21103e6..063678568 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -166,14 +166,14 @@ void MainWindow::firstShow() { : lng_enable_notifications_from_tray); if (isLinux) { - trayIconMenu->addAction(lang(lng_open_from_tray), this, SLOT(showFromTray()))->setEnabled(true); + trayIconMenu->addAction(lang(lng_open_from_tray) + QCoreApplication::applicationName(), this, SLOT(showFromTray()))->setEnabled(true); trayIconMenu->addAction(lang(lng_minimize_to_tray), this, SLOT(minimizeToTray()))->setEnabled(true); trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()))->setEnabled(true); - trayIconMenu->addAction(lang(lng_quit_from_tray), this, SLOT(quitFromTray()))->setEnabled(true); + trayIconMenu->addAction(lang(lng_quit_from_tray) + QCoreApplication::applicationName(), this, SLOT(quitFromTray()))->setEnabled(true); } else { trayIconMenu->addAction(lang(lng_minimize_to_tray), this, SLOT(minimizeToTray()))->setEnabled(true); trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()))->setEnabled(true); - trayIconMenu->addAction(lang(lng_quit_from_tray), this, SLOT(quitFromTray()))->setEnabled(true); + trayIconMenu->addAction(lang(lng_quit_from_tray) + QCoreApplication::applicationName(), this, SLOT(quitFromTray()))->setEnabled(true); } Global::RefWorkMode().setForced(Global::WorkMode().value(), true); From 34e3ac75e189da9bf84cd0588cd40afbf2185234 Mon Sep 17 00:00:00 2001 From: Alexey Minnekhanov Date: Mon, 5 Feb 2018 14:14:08 +0300 Subject: [PATCH 2/2] tabs! --- Telegram/SourceFiles/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index 063678568..28a1a6525 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -166,14 +166,14 @@ void MainWindow::firstShow() { : lng_enable_notifications_from_tray); if (isLinux) { - trayIconMenu->addAction(lang(lng_open_from_tray) + QCoreApplication::applicationName(), this, SLOT(showFromTray()))->setEnabled(true); + trayIconMenu->addAction(lang(lng_open_from_tray) + QCoreApplication::applicationName(), this, SLOT(showFromTray()))->setEnabled(true); trayIconMenu->addAction(lang(lng_minimize_to_tray), this, SLOT(minimizeToTray()))->setEnabled(true); trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()))->setEnabled(true); - trayIconMenu->addAction(lang(lng_quit_from_tray) + QCoreApplication::applicationName(), this, SLOT(quitFromTray()))->setEnabled(true); + trayIconMenu->addAction(lang(lng_quit_from_tray) + QCoreApplication::applicationName(), this, SLOT(quitFromTray()))->setEnabled(true); } else { trayIconMenu->addAction(lang(lng_minimize_to_tray), this, SLOT(minimizeToTray()))->setEnabled(true); trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()))->setEnabled(true); - trayIconMenu->addAction(lang(lng_quit_from_tray) + QCoreApplication::applicationName(), this, SLOT(quitFromTray()))->setEnabled(true); + trayIconMenu->addAction(lang(lng_quit_from_tray) + QCoreApplication::applicationName(), this, SLOT(quitFromTray()))->setEnabled(true); } Global::RefWorkMode().setForced(Global::WorkMode().value(), true);