procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use custom application name in tray popup menu (#106) 

* Use parameter {appname} for tray icon lang strings and update mainwindow.cpp to use parametrized lang calls;

Note: this fix is only for Windows version. Mac version requires separate changes.

Relates to #20 .
This commit is contained in:
Alexey Min 2018-03-02 17:08:48 +03:00 committed by Alex
parent 6b4e4dd006
commit 747e8b3ab5
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/Resources/langs/lang.strings
View File

@ -37,10 +37,10 @@ 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 {appname}";
"lng_minimize_to_tray" = "Minimize to tray";
"lng_quit_from_tray" = "Quit Telegram";
"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_quit_from_tray" = "Quit {appname}";
"lng_tray_icon_text" = "{appname} 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";
"lng_month2" = "February";

8
Telegram/SourceFiles/mainwindow.cpp
View File

@ -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(lng_open_from_tray(lt_appname, lang(appname)), 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(lng_quit_from_tray(lt_appname, lang(appname)), 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(lng_quit_from_tray(lt_appname, lang(appname)), this, SLOT(quitFromTray()))->setEnabled(true);
}
Global::RefWorkMode().setForced(Global::WorkMode().value(), true);
@ -610,7 +610,7 @@ void MainWindow::updateTrayMenu(bool force) {
disconnect(toggleAction, SIGNAL(triggered(bool)), this, SLOT(minimizeToTray()));
disconnect(toggleAction, SIGNAL(triggered(bool)), this, SLOT(showFromTray()));
connect(toggleAction, SIGNAL(triggered(bool)), this, active ? SLOT(minimizeToTray()) : SLOT(showFromTray()));
toggleAction->setText(lang(active ? lng_minimize_to_tray : lng_open_from_tray));
toggleAction->setText(active ? lang(lng_minimize_to_tray) : lng_open_from_tray(lt_appname, lang(appname)));
// On macOS just remove trayIcon menu if the window is not active.
// So we will activate the window on click instead of showing the menu.

2
Telegram/SourceFiles/platform/win/main_window_win.cpp
View File

@ -685,7 +685,7 @@ void MainWindow::psSetupTrayIcon() {
void MainWindow::showTrayTooltip() {
if (trayIcon && !cSeenTrayTooltip()) {
trayIcon->showMessage(str_const_toString(AppName), lang(lng_tray_icon_text), QSystemTrayIcon::Information, 10000);
trayIcon->showMessage(str_const_toString(AppName), lng_tray_icon_text(lt_appname, lang(appname)), QSystemTrayIcon::Information, 10000);
cSetSeenTrayTooltip(true);
Local::writeSettings();
}